nixos: increase laziness regarding shared modules

This commit is contained in:
Robert Helgesson
2025-02-06 00:48:36 +01:00
parent ed1eeeeee6
commit 6ce4338185

View File

@@ -33,15 +33,18 @@ let
modulesPath = builtins.toString ../modules; modulesPath = builtins.toString ../modules;
} }
// cfg.extraSpecialArgs; // cfg.extraSpecialArgs;
modules = [ modules = [
( (
{ name, ... }: { name, ... }:
{ {
imports = import ../modules/modules.nix { imports =
inherit pkgs; import ../modules/modules.nix {
lib = extendedLib; inherit pkgs;
useNixpkgsModule = !cfg.useGlobalPkgs; lib = extendedLib;
}; useNixpkgsModule = !cfg.useGlobalPkgs;
}
++ cfg.sharedModules;
config = { config = {
submoduleSupport.enable = true; submoduleSupport.enable = true;
@@ -63,8 +66,7 @@ let
}; };
} }
) )
] ];
++ cfg.sharedModules;
}; };
in in