Regenerated

Droidnix/README.org

@@ -327,7 +327,7 @@ in
 * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure
 ** =generated/hosts/traveldroid/traveldroid.nix=
 #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/traveldroid.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, inputs,... }:
+{ lib, config, inputs, ... }:
 
 # Standaard username
 let
@@ -338,7 +338,7 @@ let
   importedModules = inputs.import-tree modulesPath;
   moduleSwitches = import ./assets/system/modules.conf;
 
-  # Alleen de ingeschakelde modules
+  # Alleen ingeschakelde modules (blijft attrset)
   enabledModules =
     lib.filterAttrs (name: _: moduleSwitches.${name} or false)
       importedModules.imports;
@@ -346,21 +346,23 @@ let
   # Zet modules om naar lijst
   moduleList = builtins.attrValues enabledModules;
 
-  # Haal home-manager fragmenten op en zorg dat het altijd attrsets zijn
+  # Haal home-manager fragmenten op, converteer alles naar veilige attrsets
   getFragment = module:
     if builtins.hasAttr "homeManagerExtraUserFragment" module
     then module.homeManagerExtraUserFragment
     else {};
 
-  safeFragments = map (frag:
-    if builtins.isAttrs frag then frag else {}
-  ) (map getFragment moduleList);
+  safeFragment = frag:
+    if builtins.isAttrs frag then frag
+    else if builtins.isFunction frag then {}
+    else {};
 
-  # Merge alle fragments
+  safeFragments = map (frag: safeFragment (getFragment frag)) moduleList;
+
+  # Merge alle veilige fragments
   homeManagerExtraUserFragments = lib.foldl' lib.mkMerge {} safeFragments;
 
-in
-{
+in {
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";