Regenerated

Droidnix/README.org

@@ -494,6 +494,10 @@ let
                     then builtins.readFile stylixConfFile
                     else "";
 
+  # Default cursor values
+  cursorName = "phinger-cursors-light";
+  cursorSize = 24;
+
 in
 {
   # --- Top-level toggle ---
@@ -509,32 +513,24 @@ in
         value.source = value.src;
       }) files;
 
-    # Provide stylix.conf content as an environment variable (or for further init scripts)
-    home-manager.users.${username}.home.sessionVariables = {
-      STYLIX_CONF = stylixConf;
-    };
-
-    # Optional wallpaper helper packages (symbolic, install manually or via packages)
-    environment.systemPackages = [
-      # symbolic references, actual pkgs mapping done elsewhere
-      "feh"
-      "st"
-    ];
-
-    # Cursor environment variables (read from stylix.conf if needed)
-    # Minimal example using defaults from your stylix.conf
-    home-manager.users.${username}.home.sessionVariables = lib.mkForce (
-      let
-        # Default cursor values if stylix.conf parsing not implemented
-        cursorName = "phinger-cursors-light";
-        cursorSize = 24;
-      in {
+    # Merge all session variables into a single map
+    home-manager.users.${username}.home.sessionVariables = lib.mkMerge [
+      {
+        STYLIX_CONF = stylixConf;
+      }
+      {
         XCURSOR_THEME    = cursorName;
         XCURSOR_SIZE     = toString cursorSize;
         HYPRCURSOR_THEME = cursorName;
         HYPRCURSOR_SIZE  = toString cursorSize;
       }
-    );
+    ];
+
+    # Optional wallpaper helper packages (symbolic, install manually or via packages)
+    environment.systemPackages = [
+      "feh"
+      "st"
+    ];
   };
 }
 #+END_SRC