diff options
Diffstat (limited to 'parts/lib/configs.nix')
| -rw-r--r-- | parts/lib/configs.nix | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/parts/lib/configs.nix b/parts/lib/configs.nix index a3c20a6..5392d9b 100644 --- a/parts/lib/configs.nix +++ b/parts/lib/configs.nix @@ -1,11 +1,6 @@ -{ - inputs, - self, - ... -}: let - inherit (builtins) attrNames mapAttrs; +{inputs, ...}: let + inherit (builtins) mapAttrs; inherit (inputs) nixpkgs hm; - inherit (nixpkgs.lib) genAttrs optional; mkSystemCfg = name: { profile, @@ -16,7 +11,7 @@ profile.builder { inherit specialArgs system; modules = - [../../hosts/${name}] + [../systems/${name}] ++ ( if modules == profile.modules then modules @@ -25,8 +20,8 @@ }; mkHMCfg = name: { - pkgs ? import nixpkgs {system = "x86_64-linux";}, - extraSpecialArgs ? inputs, + pkgs ? nixpkgs.legacyPackages."x86_64-linux", + extraSpecialArgs ? {inherit inputs;}, modules ? [], }: hm.lib.homeManagerConfiguration { @@ -34,23 +29,16 @@ modules = [ - self.homeManagerModules.${name} - ../../users/${name}/home.nix + ../users/${name}/home.nix { _module.args.osConfig = {}; programs.home-manager.enable = true; } ] - ++ optional pkgs.stdenv.isDarwin ../../users/${name}/darwin.nix ++ modules; }; in { - inherit mkHMCfg mkSystemCfg; - mapHMUsers = mapAttrs mkHMCfg; - mapSystems = mapAttrs mkSystemCfg; - - genHMModules = users: - genAttrs (attrNames users) (name: import ../../users/${name}/module.nix); + mapHMUsers = mapAttrs mkHMCfg; } |