From ccad735371f5924701648cd89886bccc18c16b7c Mon Sep 17 00:00:00 2001
From: Gregor Grigorjan <gregor@grigorjan.net>
Date: Sat, 25 May 2024 18:01:08 +0300
Subject: [PATCH] tweak(stylix): theme

---
 modules/nixos/programs/spotify/default.nix    | 28 +++++++++++--------
 .../nixos/stylix/stylesheets/main/default.nix |  6 ++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/modules/nixos/programs/spotify/default.nix b/modules/nixos/programs/spotify/default.nix
index af3cfc3..0799778 100644
--- a/modules/nixos/programs/spotify/default.nix
+++ b/modules/nixos/programs/spotify/default.nix
@@ -14,23 +14,29 @@ in
 {
   options.elementary.programs.spotify = with types; {
     enable = mkEnableOption "Spotify";
-    theme = mkOpt str "Sleek" "The Spicetify theme to apply";
-    colorScheme = mkOpt str "RosePine" "The color scheme to apply to the Spicetify theme";
+    spicetifyTheme = {
+      enable = mkEnableOption "Spicetify theme";
+      theme = mkOpt str "Sleek" "The Spicetify theme to apply";
+      colorScheme = mkOpt str "RosePine" "The color scheme to apply to the Spicetify theme";
+    };
   };
 
   config = mkIf cfg.enable {
     elementary.home = {
       extraOptions.imports = [ inputs.spicetify-nix.homeManagerModule ];
 
-      programs.spicetify = {
-        enable = true;
-        inherit (cfg) colorScheme;
-        theme = spicePkgs.themes.${cfg.theme};
-        enabledExtensions = with spicePkgs.extensions; [
-          genre
-          keyboardShortcut
-        ];
-      };
+      programs.spicetify =
+        {
+          enable = true;
+          enabledExtensions = with spicePkgs.extensions; [
+            genre
+            keyboardShortcut
+          ];
+        }
+        // (lib.optionalAttrs cfg.spicetifyTheme.enable {
+          inherit (cfg.spicetifyTheme) colorScheme;
+          theme = spicePkgs.themes.${cfg.spicetifyTheme.theme};
+        });
     };
   };
 }
diff --git a/modules/nixos/stylix/stylesheets/main/default.nix b/modules/nixos/stylix/stylesheets/main/default.nix
index 68f8c46..29782eb 100644
--- a/modules/nixos/stylix/stylesheets/main/default.nix
+++ b/modules/nixos/stylix/stylesheets/main/default.nix
@@ -15,7 +15,7 @@ with lib.elementary;
       elementary.stylix.extraOptions = {
         polarity = "dark";
         image = "${pkgs.elementary.wallpapers}/share/wallpapers/cyberpunkgirl-inverted.png";
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+        base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml";
 
         opacity = {
           terminal = 0.85;
@@ -101,7 +101,6 @@ with lib.elementary;
             gaps_in = 5
 
             border_size = 2
-            col.active_border = rgb(f5bde6) rgb(c6a0f6) rgb(8bd5ca) rgb(91d7e3) rgb(7dc4e4) rgb(8aadf4) rgb(b7bdf8)
         }
 
         decoration {
@@ -125,8 +124,7 @@ with lib.elementary;
     }
     {
       elementary.programs.spotify = {
-        theme = "Sleek";
-        colorScheme = "RosePine";
+        enable = true;
       };
     }
   ];