From 7dfd6977aad6ddbb742c738d39daa388557b315b Mon Sep 17 00:00:00 2001 From: sefidel Date: Wed, 24 Jan 2024 19:10:23 +0900 Subject: feat(nixos): import all modules by default --- lib/mk_system.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib') 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 -- cgit 1.4.1