Regenerated

Droidnix/README.org

@@ -146,21 +146,16 @@ The Nix flake definition for Droidnix.
 { lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
 let
-  hostname    = "traveldroid";
+  hostname = "traveldroid";
 
   modulesPath = "${flakeRoot}/generated/modules/${hostname}";
   usersPath   = "${flakeRoot}/generated/users";
 
-  # Import module trees (NOT evaluated yet)
-  hostModules   = import-tree modulesPath;
-  globalUsers   = import-tree usersPath;
+  hostModules = import-tree modulesPath;
+  globalUsers = import-tree usersPath;
 
   allModules = hostModules.imports ++ globalUsers.imports;
 
-  # Collect all hmUsers safely
-  hmUsersList =
-    map (m: m._module.args.hmUsers or {}) allModules;
-
 in
 {
   #################################
@@ -171,7 +166,7 @@ in
   system.stateVersion = "26.05";
 
   #################################
-  # CRITICAL: enable Home Manager
+  # Imports
   #################################
 
   imports =
@@ -179,22 +174,13 @@ in
       ./boot.nix
       ./hardware-configuration.nix
 
-      # THIS is required
+      # REQUIRED for Home Manager
       home-manager.nixosModules.home-manager
     ]
     ++ allModules;
 
   #################################
-  # Home Manager settings
-  #################################
-
-  programs.home-manager.enable = true;
-
-  # Merge all hmUsers from modules
-  home-manager.users = lib.mkMerge hmUsersList;
-
-  #################################
-  # Optional but recommended
+  # Home Manager integration
   #################################
 
   home-manager.useGlobalPkgs = true;