Regenerated

Droidnix/README.org

@@ -332,39 +332,46 @@ in
 let
   username = config.defaultUser or "henrov";
 
+  # Modules directory en switches
   modulesPath = ./generated/parked;
   importedModules = inputs.import-tree modulesPath;
   moduleSwitches = import ./assets/system/modules.conf;
 
-  # Alleen ingeschakelde modules (blijft attrset)
+  # Alleen ingeschakelde modules
   enabledModules =
     lib.filterAttrs (name: _: moduleSwitches.${name} or false)
       importedModules.imports;
 
   moduleList = builtins.attrValues enabledModules;
 
-  # Functie: forceer fragment naar attrset
-  forceFragment = frag:
+  # Functie: haal homeManagerExtraUserFragment en forceer het tot veilige attrset
+  safeFragment = module:
     let
-      evaluated = if builtins.isFunction frag then frag {} else frag;
-      asAttrs = if builtins.isAttrs evaluated then evaluated else {};
+      frag =
+        if builtins.hasAttr "homeManagerExtraUserFragment" module
+        then module.homeManagerExtraUserFragment
+        else {};
+      evaluated =
+        if builtins.isFunction frag then frag {} else frag;
     in
-      # Filter eventueel verborgen thunks/lists
-      lib.filterAttrs (name: _: builtins.isAttrs evaluated.${name} || builtins.isBool evaluated.${name} || builtins.isString evaluated.${name}) asAttrs;
+      if builtins.isAttrs evaluated then evaluated
+      else {};
 
-  # Haal en forceer alle home-manager fragments
-  safeFragments =
-    map (m: forceFragment (if builtins.hasAttr "homeManagerExtraUserFragment" m
-                            then m.homeManagerExtraUserFragment else {}))
-        moduleList;
+  # Alle fragments per module
+  allFragments = map safeFragment moduleList;
 
-  homeManagerExtraUserFragments = lib.foldl' lib.mkMerge {} safeFragments;
+  # Merge alles per gebruiker
+  mergedForUser = lib.foldl' lib.mkMerge {} allFragments;
 
-in {
+in
+{
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  home-manager.users = homeManagerExtraUserFragments;
+  # Top-level key is username → value is attrset
+  home-manager.users = {
+    "${username}" = mergedForUser;
+  };
 }
 #+END_SRC