Regenerated

Droidnix/README.org

@@ -627,16 +627,21 @@ in
 { pkgs, lib, config, flakeRoot, ... }:
 
 let
-  username = config.defaultUser or "henrov";
+  # Default user from host config
+  username   = config.defaultUser or "henrov";
   moduleName = "stylix";
+
+  # Path to stylix configuration assets
   assetPath  = "${flakeRoot}/assets/traveldroid/conf/";
 
+  # Read all files in the asset directory
   programFiles = builtins.readDir assetPath;
 
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
     source = "${assetPath}/${name}";
   });
 
+  # Cursor defaults
   cursorName = "phinger-cursors-light";
   cursorSize = 24;
 in
@@ -652,31 +657,32 @@ in
   ############################
   # Home Manager user config
   ############################
-  home-manager.users = lib.recursiveUpdate (config.home-manager.users or {}) {
-    "${username}" = {
-      stylix = {
-        enable = true;
+  home-manager.users."${username}" = {
+    stylix = {
+      enable = true;
 
-        targets = {
-          gtk = {
-            enable = true;
-          };
+      # Enable GTK target for Stylix
+      targets = {
+        gtk = {
+          enable = true;
         };
-
-        xdg.configFile = lib.mapAttrs' (name: value: {
-          name = "${moduleName}/${name}";
-          value = { inherit (value) source; };
-        }) files;
       };
 
-      home.sessionVariables = {
-        STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
+      # Map all configuration files into ~/.config/stylix/
+      xdg.configFile = lib.mapAttrs' (name: value: {
+        name = "${moduleName}/${name}";
+        value = { inherit (value) source; };
+      }) files;
+    };
 
-        XCURSOR_THEME    = cursorName;
-        XCURSOR_SIZE     = toString cursorSize;
-        HYPRCURSOR_THEME = cursorName;
-        HYPRCURSOR_SIZE  = toString cursorSize;
-      };
+    # Environment variables for the session
+    home.sessionVariables = {
+      STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
+
+      XCURSOR_THEME    = cursorName;
+      XCURSOR_SIZE     = toString cursorSize;
+      HYPRCURSOR_THEME = cursorName;
+      HYPRCURSOR_SIZE  = toString cursorSize;
     };
   };
 }