From 1907140e0357ce25e18a280a61b43ee17f708360 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Thu, 28 Sep 2023 18:21:16 +0200
Subject: [PATCH] feat: switch to decaycs/onedark mix theme

---
 modules/optional/graphical/default.nix | 77 ++++++++++++++++++++------
 users/myuser/graphical/theme.nix       | 24 ++------
 2 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/modules/optional/graphical/default.nix b/modules/optional/graphical/default.nix
index 7408835..7e56df9 100644
--- a/modules/optional/graphical/default.nix
+++ b/modules/optional/graphical/default.nix
@@ -35,26 +35,69 @@ in
       stylix = {
         # I want to choose what to style myself.
         autoEnable = false;
-        polarity = "dark";
         image = config.lib.stylix.pixel "base00";
+
+        polarity = "dark";
+
+        # onedark
+        # base16Scheme = {
+        #   base00 = "#282c34";
+        #   base01 = "#353b45";
+        #   base02 = "#3e4451";
+        #   base03 = "#545862";
+        #   base04 = "#565c64";
+        #   base05 = "#abb2bf";
+        #   base06 = "#b6bdca";
+        #   base07 = "#c8ccd4";
+        #   base08 = "#e06c75";
+        #   base09 = "#d19a66";
+        #   base0A = "#e5c07b";
+        #   base0B = "#98c379";
+        #   base0C = "#56b6c2";
+        #   base0D = "#61afef";
+        #   base0E = "#c678dd";
+        #   base0F = "#9378de";
+        # };
+
+        # based on decaycs-dark, normal variant
         base16Scheme = {
-          base00 = "282c34";
-          base01 = "353b45";
-          base02 = "3e4451";
-          base03 = "545862";
-          base04 = "565c64";
-          base05 = "abb2bf";
-          base06 = "b6bdca";
-          base07 = "c8ccd4";
-          base08 = "e06c75";
-          base09 = "d19a66";
-          base0A = "e5c07b";
-          base0B = "98c379";
-          base0C = "56b6c2";
-          base0D = "61afef";
-          base0E = "c678dd";
-          base0F = "be5046";
+          base00 = "#101419";
+          base01 = "#171B20";
+          base02 = "#21262e";
+          base03 = "#242931";
+          base04 = "#485263";
+          base05 = "#b6beca";
+          base06 = "#dee1e6";
+          base07 = "#e3e6eb";
+          base08 = "#e05f65";
+          base09 = "#f9a872";
+          base0A = "#f1cf8a";
+          base0B = "#78dba9";
+          base0C = "#74bee9";
+          base0D = "#70a5eb";
+          base0E = "#c68aee";
+          base0F = "#9378de";
         };
+
+        ## based on decaycs-dark, bright variant
+        #base16Scheme = {
+        #  base00 = "#101419";
+        #  base01 = "#171B20";
+        #  base02 = "#21262e";
+        #  base03 = "#242931";
+        #  base04 = "#485263";
+        #  base05 = "#b6beca";
+        #  base06 = "#dee1e6";
+        #  base07 = "#e3e6eb";
+        #  base08 = "#e5646a";
+        #  base09 = "#f7b77c";
+        #  base0A = "#f6d48f";
+        #  base0B = "#94F7C5";
+        #  base0C = "#79c3ee";
+        #  base0D = "#75aaf0";
+        #  base0E = "#cb8ff3";
+        #  base0F = "#9d85e1";
+        #};
       };
     };
   }
diff --git a/users/myuser/graphical/theme.nix b/users/myuser/graphical/theme.nix
index ee99a97..d620486 100644
--- a/users/myuser/graphical/theme.nix
+++ b/users/myuser/graphical/theme.nix
@@ -1,5 +1,7 @@
 {
+  config,
   lib,
+  nixosConfig,
   pkgs,
   ...
 }: {
@@ -50,7 +52,7 @@
     gtk4.extraConfig = gtk34extraConfig;
   };
 
-  home.sessionVariables.GTK_THEME = "WhiteSur-Dark-solid";
+  home.sessionVariables.GTK_THEME = config.gtk.theme.name;
 
   qt = {
     enable = true;
@@ -58,25 +60,7 @@
   };
 
   stylix = {
-    polarity = "dark";
-    base16Scheme = {
-      base00 = "282c34";
-      base01 = "353b45";
-      base02 = "3e4451";
-      base03 = "545862";
-      base04 = "565c64";
-      base05 = "abb2bf";
-      base06 = "b6bdca";
-      base07 = "c8ccd4";
-      base08 = "e06c75";
-      base09 = "d19a66";
-      base0A = "e5c07b";
-      base0B = "98c379";
-      base0C = "56b6c2";
-      base0D = "61afef";
-      base0E = "c678dd";
-      base0F = "be5046";
-    };
+    inherit (nixosConfig.stylix) polarity base16Scheme;
     targets.gtk.enable = true;
   };
 }