From f0916dd0158f5392fd47b350c3186d6da71b6d16 Mon Sep 17 00:00:00 2001 From: tx0 Date: Fri, 14 Mar 2025 16:51:07 +0000 Subject: [PATCH] some changes --- flake.nix | 3 +-- home/default.nix | 3 +-- home/users/tx0/default.nix | 8 ++++++-- host/default.nix | 8 ++++++-- modules/default.nix | 8 ++++++-- ulib/default.nix | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 6e49767..b2a1f1e 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,9 @@ flake = let machineConf = import ./machines/earth/earth.nix {inherit self;}; system = machineConf.universe.system.arch; - u = import ./ulib {inherit inputs system;}; in { nixosConfigurations."earth" = inputs.nixpkgs.lib.nixosSystem { - specialArgs = {inherit system inputs u;}; + specialArgs = {inherit system inputs;}; modules = [ machineConf ./modules diff --git a/home/default.nix b/home/default.nix index 58c806e..48cea03 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,7 +2,6 @@ config, system, inputs, - u, ... }: { home-manager = { @@ -10,6 +9,6 @@ useUserPackages = true; backupFileExtension = "hm-old"; users.${config.universe.system.username} = import ./users/${config.universe.system.username}; - extraSpecialArgs = {inherit system inputs u;}; + extraSpecialArgs = {inherit system inputs;}; }; } diff --git a/home/users/tx0/default.nix b/home/users/tx0/default.nix index f3fe312..c7ce395 100644 --- a/home/users/tx0/default.nix +++ b/home/users/tx0/default.nix @@ -1,5 +1,9 @@ -{u, ...}: { - imports = u.umport { +{ + inputs, + system, + ... +}: { + imports = inputs.nypkgs.legacyPackages.${system}.lib.umport { path = ./.; include = [ diff --git a/host/default.nix b/host/default.nix index 2b679e2..7edb133 100644 --- a/host/default.nix +++ b/host/default.nix @@ -1,6 +1,10 @@ -{u, ...}: { +{ + inputs, + system, + ... +}: { system.stateVersion = "24.11"; - imports = u.umport { + imports = inputs.nypkgs.legacyPackages.${system}.lib.umport { path = ./.; exclude = [ diff --git a/modules/default.nix b/modules/default.nix index b86ca0f..1b1d56b 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,9 @@ -{u, ...}: { - imports = u.umport { +{ + inputs, + system, + ... +}: { + imports = inputs.nypkgs.legacyPackages.${system}.lib.umport { path = ./.; exclude = [ diff --git a/ulib/default.nix b/ulib/default.nix index b882ad1..c81d9d9 100644 --- a/ulib/default.nix +++ b/ulib/default.nix @@ -3,5 +3,5 @@ system, ... }: { - umport = inputs.nypkgs.legacyPackages.${system}.lib.umport; + umport = ; }