From 6ce433818580edc2acbf7282455331c4a5b95aae Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 6 Feb 2025 00:48:36 +0100 Subject: [PATCH] nixos: increase laziness regarding shared modules --- nixos/common.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/common.nix b/nixos/common.nix index 0c6613db5..7807029cd 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -33,15 +33,18 @@ let modulesPath = builtins.toString ../modules; } // cfg.extraSpecialArgs; + modules = [ ( { name, ... }: { - imports = import ../modules/modules.nix { - inherit pkgs; - lib = extendedLib; - useNixpkgsModule = !cfg.useGlobalPkgs; - }; + imports = + import ../modules/modules.nix { + inherit pkgs; + lib = extendedLib; + useNixpkgsModule = !cfg.useGlobalPkgs; + } + ++ cfg.sharedModules; config = { submoduleSupport.enable = true; @@ -63,8 +66,7 @@ let }; } ) - ] - ++ cfg.sharedModules; + ]; }; in