fix(pops.modules): use mkMerge with winnow

tao3k · May 1, 2024 · 9096efa · 9096efa
1 parent 8eca30c
commit 9096efa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/local/cells/repo/pops.nix b/local/cells/repo/pops.nix
@@ -7,7 +7,7 @@ in
   configs = inputs.omnibus.pops.configs {
     inputs = {
       inputs = {
-        inherit (inputs') nixfmt pre-commit-hooks;
+        inherit (inputs') nixfmt git-hooks;
         inherit (inputs) std;
         inherit nixpkgs;
       };

diff --git a/local/flake.lock b/local/flake.lock
diff --git a/src/haumea/importModule.nix b/src/haumea/importModule.nix
@@ -123,10 +123,9 @@ in
               in
               loadExtendModuleFromValue;
 
-            winnow =
-              path: module: fun:
-              ({
-                config =
+            winnow = path: module: fun: ({
+              config = lib.mkMerge [
+                (
                   if module ? config then
                     module.config
                   else
@@ -135,13 +134,13 @@ in
                         "options"
                         "imports"
                       ]
-                    );
-                imports = module.imports or [ ];
-              })
-              // {
-                _file = path;
-                options = fun module.options or { };
-              };
+                    )
+                )
+              ];
+              imports = module.imports or [ ];
+              _file = path;
+              options = lib.mkMerge [ (fun module.imports or { }) ];
+            });
 
             callDefaultModule = importer moduleArgs path;
             # => { config = { }; imports = [... ]; _file }