Regenerated

Droidnix/README.org

@@ -373,30 +373,34 @@ let
   username = config.defaultUser or "henrov";
 
   modulesPath = ./generated/modules;
-
   imported = inputs.import-tree modulesPath;
 
   moduleSwitches = import ../../../assets/system/conf/modules.conf;
 
-  # imported.imports is a LIST → filter it as a list
-  enabledModules =
-    builtins.filter (m:
-      let
-        name =
-          if builtins.hasAttr "__file" m
-          then builtins.baseNameOf m.__file
-          else "unknown";
-      in
-        moduleSwitches.${name} or false
-    ) imported.imports;
-
-  # evaluate modules
+  # STEP 1: evaluate all modules first
   evaluatedModules =
     map (m:
       if builtins.isFunction m
       then m { inherit lib config; }
       else m
-    ) enabledModules;
+    ) imported.imports;
+
+  # STEP 2: attach names safely, stripping .nix
+  modulesWithNames =
+    map (m: {
+      name =
+        if m ? _file
+        then builtins.replaceSuffix ".nix" "" (builtins.baseNameOf m._file)
+        else "unknown";
+      value = m;
+    }) evaluatedModules;
+
+  # STEP 3: filter enabled modules
+  enabledModules =
+    builtins.filter (m: moduleSwitches.${m.name} or false) modulesWithNames;
+
+  # STEP 4: extract final module values
+  moduleList = map (m: m.value) enabledModules;
 
 in
 {
@@ -404,15 +408,11 @@ in
   system.stateVersion = "26.05";
 
   home-manager.users =
-    lib.mkMerge evaluatedModules;
+    lib.mkMerge moduleList;
 
-  # debug
+  # debug: list of loaded modules
   environment.variables.LOADED_MODULES =
-    builtins.concatStringsSep "," (map (m:
-      if builtins.hasAttr "__file" m
-      then builtins.baseNameOf m.__file
-      else "unknown"
-    ) enabledModules);
+    builtins.concatStringsSep "," (map (m: m.name) enabledModules);
 }
 #+END_SRC