diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 28 |
1 files changed, 18 insertions, 10 deletions
@@ -24,14 +24,22 @@ lib = packageSets.unstable.lib; extra_lib = raw_sources.library.nixLib; - extra_modules = [ - sources.agenix.nixosModules.default - sources.turtle.nixosModules.nixos - sources.disko.nixosModules.default - sources.impermanence.nixosModules.impermanence - sources.simple-nixos-mailserver.nixosModule - sources.rocie.nixosModules.default - ]; + extra_modules = { + nixos = { + agenix = sources.agenix.nixosModules.default; + turtle = sources.turtle.nixosModules.nixos; + disko = sources.disko.nixosModules.default; + impermanence = sources.impermanence.nixosModules.impermanence; + simple-nixos-mailserver = sources.simple-nixos-mailserver.nixosModule; + rocie = sources.rocie.nixosModules.default; + home-manager = sources.home-manager.nixosModules.home-manager; + lanzaboote = sources.lanzaboote.nixosModules.lanzaboote; + }; + home = { + nix-index-database = sources.nix-index-database.homeModules.nix-index; + nixvim = sources.nixvim.homeManagerModule; + }; + }; module_args = { inherit sources @@ -48,6 +56,7 @@ # Needs to be a special argument, because it is used for determining the `imports` # value (via `mkByName`). extra_lib + extra_modules ; }; @@ -64,7 +73,6 @@ extra_lib module_args special_args - extra_modules system ; inherit @@ -78,7 +86,7 @@ deployChecks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) sources.deploy-rs.lib; tests = lib.attrsets.filterAttrs (_: v: !(v ? meta && v.meta.broken)) (import ./tests { - inherit sources packageSets extra_modules module_args special_args extra_lib; + inherit sources packageSets module_args special_args extra_lib; }); # myPkgsFlat = # builtins.listToAttrs |