Regenerated

Droidnix/README.org

@@ -327,34 +327,28 @@ 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, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 let
-  # --- Path to your modules ---
   modulesPath = ./generated/modules;
 
-  # --- Import all modules via import-tree ---
-  importedModules = import-tree modulesPath;
+  # Import all modules via import-tree
+  importedModules = inputs.import-tree modulesPath;
 
-  # --- Flatten the modules into a list ---
   allModules = builtins.attrValues importedModules.imports;
 
-  # --- Helper: extract homeManagerExtraUsers if present ---
   getFragment = module:
     if builtins.hasAttr "homeManagerExtraUserFragment" module
     then module.homeManagerExtraUserFragment
     else {};
 
-  # --- Merge all fragments together ---
   homeManagerExtraUserFragments = lib.foldl' lib.mkMerge {} (map getFragment allModules);
 
 in
 {
-  # Host-specific configuration
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  # Enable modules
   enableFlatpaks  = false;
   enableThunar    = false;
   enableWofi      = false;
@@ -366,10 +360,9 @@ in
   enableHyprland  = true;
   enableStylix    = false;
 
-  # --- Inject the merged homeManagerExtraUsers fragments ---
   home-manager.users = lib.mkMerge [
-    config.home-manager.users
-    mergedHomeManagerUserFragments
+    (config.home-manager.users or {})
+    homeManagerExtraUserFragments
   ];
 }
 #+END_SRC