Regenerated

Droidnix/README.org

@@ -372,7 +372,6 @@ in
 let
   username = config.defaultUser or "henrov";
 
-  # Import modules
   modulesPath = ./generated/modules;
   moduleSwitches = builtins.fromJSON (builtins.readFile ./assets/system/conf/modules.json);
   importedModules = inputs.import-tree modulesPath;
@@ -383,14 +382,24 @@ let
 
   moduleList = builtins.attrValues enabledModules;
 
-  # Function to safely evaluate a fragment
+  # Recursive evaluator: forces functions → attrsets
+  forceAttrs = val:
+    if builtins.isFunction val then
+      forceAttrs (val {})
+    else if builtins.isAttrs val then
+      lib.mapAttrs (_: v: forceAttrs v) val
+    else if builtins.isList val then
+      map forceAttrs val
+    else
+      val;
+
+  # Extract fragment safely
   safeFragment = m:
-    let
-      frag = if builtins.hasAttr "homeManagerExtraUserFragment" m
-             then m.homeManagerExtraUserFragment
-             else {};
-      evaled = if builtins.isFunction frag then frag {} else frag;
-    in if builtins.isAttrs evaled then evaled else {};
+    let frag =
+      if builtins.hasAttr "homeManagerExtraUserFragment" m
+      then m.homeManagerExtraUserFragment
+      else {};
+    in forceAttrs frag;
 
   # Merge all fragments
   mergedFragments = lib.foldl' lib.mkMerge {} (map safeFragment moduleList);
@@ -399,10 +408,12 @@ in {
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  # Top-level key is username → merged fragments
   home-manager.users = {
     "${username}" = mergedFragments;
   };
+
+  # Bonus: list all imported module files
+  traveldroidModules = builtins.attrNames enabledModules;
 }
 #+END_SRC