From 95671a0343ec6b3a4bd8e19126930e3dd43ebd77 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Thu, 29 May 2025 11:14:08 +0300
Subject: [PATCH] stylix: add gruvbox-dark-pale

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 hosts/dunamis/configuration.nix              |  2 +-
 modules/home/desktop/niri/default.nix        | 20 ++++++-----
 modules/nixos/system/misc/stylix/default.nix | 38 ++++++++++++++++++--
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 9860adf..330212f 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -37,7 +37,7 @@
     };
     stylix = {
       enable = true;
-      theme = "rose-pine-moon";
+      theme = "gruvbox-dark-pale";
     };
   };
 
diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
index 7b83766..54baf3f 100644
--- a/modules/home/desktop/niri/default.nix
+++ b/modules/home/desktop/niri/default.nix
@@ -45,19 +45,21 @@ in {
     gtk = {
       enable = true;
       iconTheme = let
-        papirusPackage =
-          if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme)
+        name =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then "Gruvbox-Plus-Dark"
+          else if config.stylix.polarity == "dark"
+          then "Papirus-Dark"
+          else "Papirus-Light";
+        package =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then pkgs.gruvbox-plus-icons
+          else if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme)
           then pkgs.papirus-icon-theme.override {color = "indigo";}
           else if (lib.strings.hasPrefix "nord" osConfig.module.stylix.theme)
           then pkgs.papirus-icon-theme.override {color = "nordic";}
           else pkgs.papirus-icon-theme;
-      in {
-        name =
-          if config.stylix.polarity == "dark"
-          then "Papirus-Dark"
-          else "Papirus-Light";
-        package = papirusPackage;
-      };
+      in {inherit name package;};
     };
     qt = {
       enable = true;
diff --git a/modules/nixos/system/misc/stylix/default.nix b/modules/nixos/system/misc/stylix/default.nix
index 07ab880..f65121d 100644
--- a/modules/nixos/system/misc/stylix/default.nix
+++ b/modules/nixos/system/misc/stylix/default.nix
@@ -29,6 +29,10 @@
     if stateVersion == "24.11"
     then pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}
     else pkgs.nerd-fonts.jetbrains-mono;
+  geistMonoPackage =
+    if stateVersion == "24.11"
+    then pkgs.nerdfonts.override {fonts = ["GeistMono"];}
+    else pkgs.nerd-fonts.geist-mono;
 
   wallpapers = {
     fern-outline = builtins.fetchurl {
@@ -51,6 +55,11 @@
       name = "wallhaven-ymo2y7.png";
       sha256 = "1b3j0hxxy8m25scq42lxsxc99xvr15pha1j4wplgz761asrvxly3";
     };
+    nixos-rainbow = builtins.fetchurl {
+      url = "https://w.wallhaven.cc/full/p9/wallhaven-p9pd23.png";
+      name = "wallhaven-p9pd23.png";
+      sha256 = "7CMuETntiVUCKhUIdJzX+sf3F47GvuX2a61o4xbEzww=";
+    };
   };
   themes = {
     rose-pine-dawn = {
@@ -80,8 +89,10 @@
       wallpaper = wallpapers.cyber-dawn;
 
       serif = {
-        package = iosevkaPackage;
-        name = "Iosevka Nerd Font Propo";
+        # package = iosevkaPackage;
+        # name = "Iosevka Nerd Font Propo";
+        package = pkgs.geist-font;
+        name = "Geist Light";
       };
 
       monospace = {
@@ -95,6 +106,29 @@
         size = 24;
       };
     };
+    gruvbox-dark-pale = {
+      polarity = "dark";
+      scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
+      wallpaper = wallpapers.nixos-rainbow;
+
+      serif = {
+        # package = iosevkaPackage;
+        # name = "Iosevka Nerd Font Propo";
+        package = pkgs.geist-font;
+        name = "Geist";
+      };
+
+      monospace = {
+        package = geistMonoPackage;
+        name = "GeistMono Nerd Font";
+      };
+
+      cursor = {
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Classic";
+        size = 24;
+      };
+    };
     nord = {
       polarity = "dark";
       scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";