Regenerated

Droidnix/README.org

@@ -176,40 +176,38 @@ let
   username = config.defaultUser or "henrov";
   modulesPath = ./generated/modules;
 
-  # Import all modules recursively
+  # Import all modules recursively (DO NOT evaluate them)
   importedModules = inputs.import-tree modulesPath;
 
-  # Evaluate all modules
-  evaluatedModules =
-    map (m:
-      if builtins.isFunction m then m { inherit lib config pkgs; } else m
-    ) importedModules.imports;
+  # Collect Home Manager user attrsets from modules
+  hmUsersList =
+    map (m: m._module.args.hmUsers or {})
+      importedModules.imports;
 
-  # Attach names
-  modulesWithNames =
-    map (m: {
-      name = if m ? _file then lib.removeSuffix ".nix" (builtins.baseNameOf m._file) else "unknown";
-      value = m;
-    }) evaluatedModules;
+in
+{
+  #################################
+  # Core system config
+  #################################
 
-  # Filter enabled modules from config file (optional)
-  moduleSwitches = import ../../../assets/system/conf/modules.conf;
-  enabledModules =
-    builtins.filter (m: moduleSwitches.${m.name} or false) modulesWithNames;
-
-  # Collect Home Manager user attrsets
-  hmUsersList = map (m: m.value._module.args.hmUsers or {}) enabledModules;
-
-in {
   networking.hostName = "traveldroid";
   system.stateVersion = "26.05";
 
-  imports = [
-    ./boot.nix
-    ./hardware-configuration.nix
-  ];
+  #################################
+  # Module imports (critical fix)
+  #################################
+
+  imports =
+    [
+      ./boot.nix
+      ./hardware-configuration.nix
+    ]
+    ++ importedModules.imports;
+
+  #################################
+  # Home Manager aggregation
+  #################################
 
-  # Merge Home Manager user configurations
   home-manager.users = lib.mkMerge hmUsersList;
 }
 #+END_SRC