Regenerated

2026-03-27 14:50:34 +00:00
parent 16ff804437
commit 68a9a83ff5
3 changed files with 330 additions and 324 deletions
@@ -12,15 +12,17 @@ let
  allModules = hostModules.imports ++ globalUsers.imports;

  #########################################################
-  # Merge all _module.args.hmUsers from modules safely
+  # Merge all _module.args.hmUsers safely
  #########################################################
-  mergedHmUsers = lib.mkMerge (map (m:
-    if builtins.hasAttr "args" m
-       && builtins.hasAttr "hmUsers" m.args
-       && builtins.typeOf m.args.hmUsers == "attrset"
-    then m.args.hmUsers
-    else {}
-  ) allModules);
+  mergedHmUsers = lib.mkMerge (
+    builtins.filter (x: builtins.typeOf x == "attrset") (
+      map (m:
+        if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
+        then m.args.hmUsers
+        else {}
+      ) allModules
+    )
+  );

  #########################################################
  # Add activation to ensure all parent directories exist