diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | lib/default.nix | 9 | ||||
| -rw-r--r-- | lib/host.nix | 8 | ||||
| -rw-r--r-- | lib/user.nix | 8 |
4 files changed, 10 insertions, 24 deletions
@@ -73,14 +73,7 @@ pre-commit-hooks, ... }: let - inherit - (import ./lib { - inherit (nixpkgs) lib; - inherit inputs; - }) - mapHosts - mapHMUsers - ; + inherit (import ./lib {inherit (nixpkgs) lib;}) mapHosts mapHMUsers; in flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; diff --git a/lib/default.nix b/lib/default.nix index b909fe5..afd2890 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,4 @@ -{ - inputs, - lib, -}: let +{lib}: let inherit (builtins) readDir; inherit (lib) filterAttrs mapAttrs; @@ -10,5 +7,5 @@ in mapAttrs map dirs; in - (import ./host.nix {inherit inputs mapFilterDirs;}) - // (import ./user.nix {inherit inputs mapFilterDirs;}) + (import ./host.nix {inherit mapFilterDirs;}) + // (import ./user.nix {inherit mapFilterDirs;}) diff --git a/lib/host.nix b/lib/host.nix index b5e00b3..767124c 100644 --- a/lib/host.nix +++ b/lib/host.nix @@ -1,7 +1,4 @@ -{ - inputs, - mapFilterDirs, -}: rec { +{mapFilterDirs}: rec { mkHost = { name, modules, @@ -9,6 +6,7 @@ system ? "x86_64-linux", stateVersion ? "22.11", pkgs, + inputs, }: with pkgs.lib; nixosSystem { @@ -39,7 +37,7 @@ in mapFilterDirs ../hosts (n: v: v == "directory" && n != "turret") (name: _: mkHost { - inherit name; + inherit name inputs; inherit (hosts.${name}) modules system stateVersion pkgs; specialArgs = if builtins.hasAttr "specialArgs" hosts.${name} diff --git a/lib/user.nix b/lib/user.nix index 6377faa..75244eb 100644 --- a/lib/user.nix +++ b/lib/user.nix @@ -1,12 +1,10 @@ -{ - inputs, - mapFilterDirs, -}: rec { +{mapFilterDirs}: rec { mkHMUser = { username, pkgs, stateVersion ? "22.11", modules ? [], + inputs, }: inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; @@ -30,7 +28,7 @@ in mapFilterDirs ../users (n: v: v == "directory" && n != "secrets") (username: _: mkHMUser { - inherit username; + inherit username inputs; inherit (users.${username}) pkgs stateVersion; modules = if builtins.hasAttr "modules" users.${username} |