Regenerated

Droidnix/generated/modules/traveldroid/desktop/stylix.nix

@@ -5,7 +5,7 @@ let
   moduleName = "stylix";
 
   # Path to stylix assets
-  assetPath = ../../../assets/system/conf/${moduleName};
+  assetPath = "${flakeRoot}/assets/system/conf/${moduleName}";
 
   # Read all files in the asset directory
   programFiles = builtins.readDir assetPath;
@@ -26,43 +26,31 @@ let
   cursorSize = 24;
 in
 {
-  ############################
+  #################################
   # System packages
-  ############################
+  #################################
   environment.systemPackages = [
     pkgs.feh
     pkgs.st
   ];
 
-  stylix = {
-    enable = true;
-    base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
-    polarity = "dark";
-    targets = {
-      gtk = { enable = true; };
-    };
-  };
-
-  ############################
-  # Home Manager user settings
-  ############################
-  # Use the _module.args.hmUsers style to avoid "option does not exist"
+  #################################
+  # Home Manager user-level configuration
+  #################################
   _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;
+      home.file = lib.mkMerge (lib.mapAttrs' (name: value: {
+        name = "${moduleName}/${name}";
+        value = { inherit (value) source; };
+      }) files);
 
-      # Optionally include stylix.conf
+      # Include stylix.conf if it exists
       home.file."${moduleName}/stylix.conf".text = stylixConf;
 
-      # Session variables
+      # Session variables for Stylix & cursors
       home.sessionVariables = {
         STYLIX_CONF      = "$HOME/.config/stylix/stylix.conf";
-
         XCURSOR_THEME    = cursorName;
         XCURSOR_SIZE     = toString cursorSize;
         HYPRCURSOR_THEME = cursorName;