Regenerated

Droidnix/README.org

@@ -621,10 +621,9 @@ in
 
 ** =generated/modules/traveldroid/desktop/stylix.nix=
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/stylix.nix  :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, flakeRoot, ... }:
+{ lib, config, pkgs, ... }:
 
 let
-  # Resolve the default username
   username   = config.defaultUser or "henrov";
   moduleName = "stylix";
 
@@ -648,16 +647,6 @@ let
   # Cursor defaults
   cursorName = "phinger-cursors-light";
   cursorSize = 24;
-
-  # Merge all config files + optional stylix.conf into one home.file set
-  homeFiles = lib.recursiveUpdate
-    (lib.genAttrs (builtins.attrNames files) (name: {
-      path = "${moduleName}/${name}";
-      source = files.${name}.source;
-    }))
-    (if stylixConf != "" then {
-      "${moduleName}/stylix.conf" = { text = stylixConf; };
-    } else {});
 in
 {
   ############################
@@ -671,28 +660,36 @@ in
   ############################
   # Home Manager user settings
   ############################
-  home-manager.users."${username}" = {
-    # Enable Stylix
-    stylix = {
-      enable  = true;
+  # Use the _module.args.hmUsers style to avoid "option does not exist"
+  _module.args.hmUsers = {
+    "${username}" = {
+      # Copy all stylix config files into ~/.config/stylix/
+      xdg.configFile =
+        lib.mapAttrs' (name: value: {
+          name = "${moduleName}/${name}";
+          value = { inherit (value) source; };
+        }) files;
 
-      # GTK integration for this user
-      targets = {
-        gtk = { enable = true; };
+      # Optionally include stylix.conf
+      home.file."${moduleName}/stylix.conf".text = stylixConf;
+
+      # Session variables
+      home.sessionVariables = {
+        STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
+
+        XCURSOR_THEME    = cursorName;
+        XCURSOR_SIZE     = toString cursorSize;
+        HYPRCURSOR_THEME = cursorName;
+        HYPRCURSOR_SIZE  = toString cursorSize;
       };
-    };
 
-    # Copy all config files into ~/.config/stylix/
-    home.file = homeFiles;
-
-    # Session environment variables
-    home.sessionVariables = {
-      STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
-
-      XCURSOR_THEME    = cursorName;
-      XCURSOR_SIZE     = toString cursorSize;
-      HYPRCURSOR_THEME = cursorName;
-      HYPRCURSOR_SIZE  = toString cursorSize;
+      # Enable GTK target for Stylix
+      stylix = {
+        enable  = true;
+        targets = {
+          gtk = { enable = true; };
+        };
+      };
     };
   };
 }