Regenerated

Droidnix/README.org

@@ -481,33 +481,31 @@ This is top file of this level which contains just an import statement for all r
 { pkgs, config, lib, ... }:
 
 let
-  # Use the default user from host.nix or fallback
+  # Resolve the default username from host config
   username = config.defaultUser or "henrov";
 in
 {
-  #################################
-  # System-wide Thunar installation
-  #################################
+  ############################
+  # System-level packages
+  ############################
   environment.systemPackages = with pkgs; [
     thunar                  # main file manager
-    thunar-archive-plugin   # zip, tar, rar, 7z support
-    thunar-volman           # auto-mount removable drives
-    gvfs                    # support for external drives and network shares
-    xarchiver               # optional GUI archive manager
+    thunar-archive-plugin    # zip, tar, rar, 7z support
+    thunar-volman            # auto-mount removable drives
+    gvfs                     # support for external drives and network shares
+    xarchiver                # optional GUI archive manager
   ];
 
-  #################################
-  # Home Manager integration for the user
-  #################################
-  home-manager.users = lib.recursiveUpdate (config.home-manager.users or {}) {
-    "${username}" = {
-      home.stateVersion = "26.05";  # required by Home Manager
+  ############################
+  # Home Manager user-level configuration
+  ############################
+  # Direct assignment to the user avoids recursiveUpdate issues
+  home-manager.users."${username}" = {
+    home.stateVersion = "26.05";  # required
 
-      # Environment variables
-      home.sessionVariables = {
-        FILE_MANAGER = "thunar";
-        USERNAME     = username;
-      };
+    home.sessionVariables = {
+      FILE_MANAGER = "thunar";
+      USERNAME     = username;
     };
   };
 }