From 91030d1e707e60d8b7428d2a3e77002e6a5dbf71 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Mon, 16 Mar 2026 22:03:59 +0000
Subject: [PATCH] trying stylix

---
 Droidnix/README.org                           | 27 +++----------------
 Droidnix/flake.nix                            |  2 +-
 Droidnix/generated/out_of_tree/core/theme.nix | 25 +++--------------
 3 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 57bc2b6d4..b8a1b1a5f 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -200,7 +200,7 @@ outputs =
         modules = [
           # theming engine
           stylix.nixosModules.stylix
-          # Importing Catppuccino mocha
+          # Importing theme file
           ./generated/out_of_tree/core/theme.nix
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/traveldroid/top.nix
@@ -621,31 +621,12 @@ You'll notice the color values in multiple places outside this as well.
 #+BEGIN_SRC nix :tangle generated/out_of_tree/core/theme.nix :noweb tangle :mkdirp yes :eval never-html
 { pkgs, flakeRoot, ... }:
 
-let
-  catppuccin-mocha = pkgs.runCommand "catppuccin-mocha-theme" {} ''
-    mkdir -p $out/share/themes
-    ln -s ${flakeRoot}/assets/hyprland/themes/Catppuccin-Mocha-Standard-Blue-Dark $out/share/themes/
-  '';
-in
 {
-  environment.systemPackages = [
-    catppuccin-mocha
-  ];
-
-  environment.sessionVariables = {
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    GTK_ENABLE_DARK_MODE = "1";
-  };
-
-  catppuccin = {
+  programs.stylix = {
     enable = true;
-    flavor = "mocha";
-    accent = "blue";
-    gtk = {
-      icon.enable = true;
+    settings = {
+      theme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
     };
-    cursors.enable = true;
   };
 }
 #+END_SRC
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 65af4f826..9d1d7d284 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -56,7 +56,7 @@ outputs =
         modules = [
           # theming engine
           stylix.nixosModules.stylix
-          # Importing Catppuccino mocha
+          # Importing theme file
           ./generated/out_of_tree/core/theme.nix
           # Import machine-specific configurations
           ./generated/out_of_tree/machines/traveldroid/top.nix
diff --git a/Droidnix/generated/out_of_tree/core/theme.nix b/Droidnix/generated/out_of_tree/core/theme.nix
index 4d89a6243..aefc2c0c8 100644
--- a/Droidnix/generated/out_of_tree/core/theme.nix
+++ b/Droidnix/generated/out_of_tree/core/theme.nix
@@ -1,29 +1,10 @@
 { pkgs, flakeRoot, ... }:
 
-let
-  catppuccin-mocha = pkgs.runCommand "catppuccin-mocha-theme" {} ''
-    mkdir -p $out/share/themes
-    ln -s ${flakeRoot}/assets/hyprland/themes/Catppuccin-Mocha-Standard-Blue-Dark $out/share/themes/
-  '';
-in
 {
-  environment.systemPackages = [
-    catppuccin-mocha
-  ];
-
-  environment.sessionVariables = {
-    GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark";
-    GTK_ICON_THEME = "Papirus-Dark";
-    GTK_ENABLE_DARK_MODE = "1";
-  };
-
-  catppuccin = {
+  programs.stylix = {
     enable = true;
-    flavor = "mocha";
-    accent = "blue";
-    gtk = {
-      icon.enable = true;
+    settings = {
+      theme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
     };
-    cursors.enable = true;
   };
 }