From 75594d6a550040817c05b8e8ad3295854c0a10dd Mon Sep 17 00:00:00 2001
From: Michel Fedde <git@iedsoftworks.com>
Date: Sat, 29 Mar 2025 19:27:26 +0100
Subject: [PATCH] Adds updates for waybar

---
 .config/nwg-drawer/style/style.scss       |  4 ++
 .config/theming/compile.sh                |  2 -
 .config/theming/update.sh                 |  8 ++++
 .config/waybar/style.css                  | 52 +++++++++++------------
 .config/yadm/bootstrap.d/20-GTKGruvbox.sh |  2 +-
 .local/share/dark-mode.d/themes.sh        |  5 +++
 .local/share/light-mode.d/themes.sh       |  5 +++
 7 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100755 .config/theming/update.sh

diff --git a/.config/nwg-drawer/style/style.scss b/.config/nwg-drawer/style/style.scss
index 83f8d85..3784d14 100644
--- a/.config/nwg-drawer/style/style.scss
+++ b/.config/nwg-drawer/style/style.scss
@@ -1,5 +1,9 @@
 @import "../../theming/library/entry.scss";
 
+* {
+  color: $foreground;
+}
+
 window {
     background-color: $background-semitransparent;
     color: $foreground
diff --git a/.config/theming/compile.sh b/.config/theming/compile.sh
index d749918..4020474 100755
--- a/.config/theming/compile.sh
+++ b/.config/theming/compile.sh
@@ -4,5 +4,3 @@ sass \
   $HOME/.config/swaync/style/style.scss:$HOME/.config/swaync/style.css \
   $HOME/.config/waybar/scss/style.scss:$HOME/.config/waybar/style.css \
   $HOME/.config/nwg-drawer/style/style.scss:$HOME/.config/nwg-drawer/drawer.css
-
-swaync-client --reload-css
diff --git a/.config/theming/update.sh b/.config/theming/update.sh
new file mode 100755
index 0000000..30b9df0
--- /dev/null
+++ b/.config/theming/update.sh
@@ -0,0 +1,8 @@
+#!/bin/env sh
+
+swaync-client --reload-css
+
+# Reload waybar
+killall waybar
+killall pactl
+nohup waybar &
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 2c963c0..efe6795 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -9,8 +9,8 @@
 }
 
 window {
-  background: rgba(40, 40, 40, 0.95);
-  color: #d5c4a1;
+  background: rgba(251, 241, 199, 0.95);
+  color: #504945;
   transition-property: background-color;
   transition-duration: 0.5s;
 }
@@ -22,10 +22,10 @@ window.semi-hidden * {
   border-radius: 0 0 0.3rem 0.3rem;
 }
 window.semi-hidden .modules-left, window.semi-hidden .modules-center, window.semi-hidden .modules-right {
-  background-color: #282828;
-  border-bottom: 1px solid rgba(213, 196, 161, 0.4);
-  border-left: 1px solid rgba(213, 196, 161, 0.4);
-  border-right: 1px solid rgba(213, 196, 161, 0.4);
+  background-color: #fbf1c7;
+  border-bottom: 1px solid rgba(80, 73, 69, 0.4);
+  border-left: 1px solid rgba(80, 73, 69, 0.4);
+  border-right: 1px solid rgba(80, 73, 69, 0.4);
 }
 window.semi-hidden .modules-center {
   padding-left: 0.3rem;
@@ -36,25 +36,25 @@ window.semi-hidden .modules-left {
 
 #taskbar button,
 #workspaces button {
-  color: #d5c4a1;
+  color: #504945;
 }
 
 #taskbar button.active,
 #workspaces button.active {
-  border-bottom: 1px solid #b8bb26;
+  border-bottom: 1px solid #79740e;
 }
 
 #taskbar button.urgent,
 #workspaces button.urgent {
-  border-bottom: 2px solid #fabd2f;
+  border-bottom: 2px solid #b57614;
 }
 
 #submap {
-  border-bottom: 1px solid #fb4934;
+  border-bottom: 1px solid #9d0006;
 }
 
 .module {
-  color: #d5c4a1;
+  color: #504945;
   padding: 0.2rem 0.3rem 0.2rem 0.3rem;
 }
 
@@ -62,17 +62,17 @@ window.semi-hidden .modules-left {
 #disk.warning,
 #memory.warning,
 #cpu.warning {
-  border-top: 3px solid #282828;
-  border-bottom: 3px solid #83a598;
+  border-top: 3px solid #fbf1c7;
+  border-bottom: 3px solid #076678;
 }
 
 @keyframes blink {
   to {
-    color: #282828;
+    color: #fbf1c7;
   }
 }
 #battery.critical:not(.charging) {
-  background-color: #fb4934;
+  background-color: #9d0006;
   color: white;
   animation-name: blink;
   animation-duration: 3s;
@@ -92,17 +92,17 @@ window.semi-hidden .modules-left {
 #disk.critical,
 #memory.critical,
 #cpu.critical {
-  border-top: 3px solid #282828;
-  border-bottom: 3px solid #fb4934;
+  border-top: 3px solid #fbf1c7;
+  border-bottom: 3px solid #9d0006;
 }
 
 #temperature.critical {
-  background-color: #fb4934;
+  background-color: #9d0006;
 }
 
 #battery.charging {
-  border-top: 3px solid #282828;
-  border-bottom: 3px solid #b8bb26;
+  border-top: 3px solid #fbf1c7;
+  border-bottom: 3px solid #79740e;
 }
 
 #pulseaudio-slider slider {
@@ -118,13 +118,13 @@ window.semi-hidden .modules-left {
   min-width: 80px;
   min-height: 5px;
   border-radius: 5px;
-  background-color: rgba(40, 40, 40, 0.75);
+  background-color: rgba(251, 241, 199, 0.75);
 }
 
 #pulseaudio-slider highlight {
   min-height: 10px;
   border-radius: 5px;
-  background-color: #fabd2f;
+  background-color: #b57614;
 }
 
 #backlight-slider slider {
@@ -140,22 +140,22 @@ window.semi-hidden .modules-left {
   min-width: 80px;
   min-height: 10px;
   border-radius: 5px;
-  background-color: #d5c4a1;
+  background-color: #504945;
 }
 
 #backlight-slider highlight {
   min-width: 10px;
   border-radius: 5px;
-  background-color: #fabd2f;
+  background-color: #b57614;
 }
 
 #custom-swaync {
   min-width: 10px;
-  border-right: 1px solid #d5c4a1;
+  border-right: 1px solid #504945;
 }
 
 #custom-swaync:hover {
-  background-color: #b8bb26;
+  background-color: #79740e;
 }
 
 #custom-updates.pending-updates {
diff --git a/.config/yadm/bootstrap.d/20-GTKGruvbox.sh b/.config/yadm/bootstrap.d/20-GTKGruvbox.sh
index 6958fce..2b5807b 100755
--- a/.config/yadm/bootstrap.d/20-GTKGruvbox.sh
+++ b/.config/yadm/bootstrap.d/20-GTKGruvbox.sh
@@ -1,4 +1,4 @@
 #!/bin/env sh
 
 echo "# Installing GTK Theme (gruvbox)"
-yay -S --needed gruvbox-material-gtk-theme-git gruvbox-material-icon-theme-git
+yay -S --needed gruvbox-material-icon-theme-git gruvbox-gtk-theme-git
diff --git a/.local/share/dark-mode.d/themes.sh b/.local/share/dark-mode.d/themes.sh
index 4b6884f..16476da 100755
--- a/.local/share/dark-mode.d/themes.sh
+++ b/.local/share/dark-mode.d/themes.sh
@@ -2,3 +2,8 @@
 
 gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 gsettings set org.gnome.desktop.interface gtk-theme "Gruvbox-Orange-Dark"
+
+wal --theme base16-gruvbox-medium
+
+$HOME/.config/theming/compile.sh
+$HOME/.config/theming/update.sh
diff --git a/.local/share/light-mode.d/themes.sh b/.local/share/light-mode.d/themes.sh
index 1b651e0..94ea14a 100755
--- a/.local/share/light-mode.d/themes.sh
+++ b/.local/share/light-mode.d/themes.sh
@@ -2,3 +2,8 @@
 
 gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
 gsettings set org.gnome.desktop.interface gtk-theme "Gruvbox-Orange-Light"
+
+wal -l --theme base16-gruvbox-medium
+
+$HOME/.config/theming/compile.sh
+$HOME/.config/theming/update.sh