diff options
| -rw-r--r-- | lib/mk_system.nix | 7 | ||||
| -rw-r--r-- | nixos/default.nix | 16 |
2 files changed, 2 insertions, 21 deletions
diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 70149fe..ba24d21 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -21,11 +21,8 @@ } entryPoint hardware - # TODO: import all modules (use mapModules?) - ../modules/flakes.nix - ../modules/nix.nix - ../modules/nixpkgs.nix - ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } + ] ++ self.lib.mapModulesRec' ../modules import + ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; # let deployment options to be set without breaking eval on nixosConfigurations diff --git a/nixos/default.nix b/nixos/default.nix index 1e4cc94..8fc1ba7 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -5,11 +5,6 @@ name = "alpha"; nixpkgs = unstable; extraModules = [ - ../modules/security.nix - ../modules/cachix - ../modules/keyd-qol.nix - ../modules/devkit.nix - ../modules/trayscale.nix inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; @@ -19,12 +14,6 @@ name = "haruka"; nixpkgs = unstable; extraModules = [ - ../modules/security.nix - ../modules/laptop.nix - ../modules/cachix - ../modules/keyd-qol.nix - ../modules/devkit.nix - ../modules/trayscale.nix inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; @@ -34,11 +23,6 @@ name = "kanata"; nixpkgs = unstable; extraModules = [ - ../modules/security.nix - ../modules/cachix - ../modules/trayscale.nix - ../modules/tailscale-initrd.nix - ../modules/services/blocky inputs.sops-nix.nixosModules.sops inputs.impermanence.nixosModules.impermanence ]; |