Regenerated

Droidnix/README.org

@@ -143,51 +143,62 @@ The Nix flake definition for Droidnix.
 
 ** =generated/hosts/traveldroid/host.nix=
 #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/host.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, inputs, ... }:
+{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
 let
   hostname    = "traveldroid";
-  modulesPath = ./generated/modules/${hostname};
-  usersPath   = ./generated/users;
 
-  # Import all host-specific modules recursively (not evaluated yet)
-  hostModules = inputs.import-tree modulesPath;
+  modulesPath = "${flakeRoot}/generated/modules/${hostname}";
+  usersPath   = "${flakeRoot}/generated/users";
 
-  # Import all global users
-  globalUsers = inputs.import-tree usersPath;
+  # Import module trees (NOT evaluated yet)
+  hostModules   = import-tree modulesPath;
+  globalUsers   = import-tree usersPath;
 
-  # Collect all Home Manager user attrsets from host modules + global users
+  allModules = hostModules.imports ++ globalUsers.imports;
+
+  # Collect all hmUsers safely
   hmUsersList =
-    map (m: m._module.args.hmUsers or {}) (hostModules.imports ++ globalUsers.imports);
+    map (m: m._module.args.hmUsers or {}) allModules;
 
 in
 {
   #################################
   # Core system config
   #################################
-  networking.hostName = traveldroid;
-  system.stateVersion  = "26.05";
+
+  networking.hostName = hostname;
+  system.stateVersion = "26.05";
 
   #################################
-  # Enable Home Manager
+  # CRITICAL: enable Home Manager
   #################################
-  programs.home-manager.enable = true;
 
-  #################################
-  # Module imports
-  #################################
   imports =
     [
       ./boot.nix
       ./hardware-configuration.nix
+
+      # THIS is required
+      home-manager.nixosModules.home-manager
     ]
-    ++ hostModules.imports
-    ++ globalUsers.imports;
+    ++ allModules;
 
   #################################
-  # Home Manager aggregation
+  # Home Manager settings
   #################################
+
+  programs.home-manager.enable = true;
+
+  # Merge all hmUsers from modules
   home-manager.users = lib.mkMerge hmUsersList;
+
+  #################################
+  # Optional but recommended
+  #################################
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
 }
 #+END_SRC