Regenerated

Droidnix/README.org

@@ -327,41 +327,44 @@ 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
-{ config, lib, inputs, ... }:
+{ lib, config, ... }:
 
+# Standaard username
 let
+  username = config.defaultUser or "henrov";
+
+  # Modules directory en switches
   modulesPath = ./generated/parked;
-
-  # Laad alle modules
-  importedModules = inputs.import-tree modulesPath;
-
-  # Laad module switches
+  importedModules = import-tree modulesPath;
   moduleSwitches = import ./assets/system/modules.conf;
 
-  # Filter ingeschakelde modules en zorg dat het een attrset blijft
+  # Alleen de ingeschakelde modules
   enabledModules =
-    lib.filterAttrs (name: _: (moduleSwitches.${name} or false)) importedModules.imports;
+    lib.filterAttrs (name: _: moduleSwitches.${name} or false)
+      importedModules.imports;
 
-  # Converteer naar lijst (voor foldl'), maar check dat elk fragment een attrset is
+  # Zet modules om naar lijst
   moduleList = builtins.attrValues enabledModules;
 
-  # Haal Home Manager fragments veilig op
+  # Haal home-manager fragmenten op en zorg dat het altijd attrsets zijn
   getFragment = module:
     if builtins.hasAttr "homeManagerExtraUserFragment" module
-    then let frag = module.homeManagerExtraUserFragment; in
-         if builtins.isAttrs frag then frag else {}
+    then module.homeManagerExtraUserFragment
     else {};
 
-  homeManagerExtraUserFragments =
-    lib.foldl' lib.mkMerge {} (map getFragment moduleList);
+  safeFragments = map (frag:
+    if builtins.isAttrs frag then frag else {}
+  ) (map getFragment moduleList);
 
-in {
+  # Merge alle fragments
+  homeManagerExtraUserFragments = lib.foldl' lib.mkMerge {} safeFragments;
+
+in
+{
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  home-manager.users = lib.mkMerge [
-    homeManagerExtraUserFragments
-  ];
+  home-manager.users = homeManagerExtraUserFragments;
 }
 #+END_SRC