From a1869ca578342a24d30433aeab5b22a5e54640d3 Mon Sep 17 00:00:00 2001
From: Uyanide <pywang0608@foxmail.com>
Date: Sat, 27 Sep 2025 21:29:19 +0200
Subject: [PATCH] update waybar-toggle script

---
 .scripts/change-colortheme  |  4 ++--
 .scripts/waybar-toggle      | 24 +++++++++++++-----------
 backgrounds                 |  2 +-
 hypr/hyprland/keybinds.conf |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.scripts/change-colortheme b/.scripts/change-colortheme
index a267706..00f25db 100755
--- a/.scripts/change-colortheme
+++ b/.scripts/change-colortheme
@@ -17,7 +17,7 @@
 - rofi:         edit $HOME/.config/rofi/config.rasi
 
 - waybar:       edit $HOME/.config/waybar/style.css
-                waybar-toggle.sh
+                waybar-toggle restart
 
 - oh-my-posh:   edit $HOME/.config/posh_theme.omp.json
 
@@ -162,7 +162,7 @@ def _change_waybar(palette: dict[str, str], flavor: str):
     waybar_template = Path.home().joinpath('.config', 'waybar', 'style.css.template')
     waybar_dist = copy_template(waybar_template, Path.home().joinpath('.config', 'waybar'))
     replace_placeholders(waybar_dist, palette, flavor)
-    os.system('waybar-toggle')
+    os.system('waybar-toggle restart')
 
 
 def _change_ohmyposh(palette: dict[str, str], flavor: str):
diff --git a/.scripts/waybar-toggle b/.scripts/waybar-toggle
index 10b1710..3e68ae7 100755
--- a/.scripts/waybar-toggle
+++ b/.scripts/waybar-toggle
@@ -1,42 +1,44 @@
 #!/usr/bin/env bash
 
+lyrics_widget_closed=0
+
 function close() {
     killall -q waybar
 
     # Also close the lyrics widget if open
     if eww active-windows | grep -q "lyrics-single"; then
         eww close lyrics-single
+        lyrics_widget_closed=1
     fi
 }
 
 function open() {
     # the system tray will not work with kded6 started
-    if killall -q "kded6"; then
+    if killall -q -9 "kded6"; then
         while pgrep -x "kded6" >/dev/null; do
             sleep 0.2
         done
     fi
     (setsid waybar > /dev/null 2> /dev/null &)&
     disown
+
+    # Reopen the lyrics widget if it was previously closed
+    if [ $lyrics_widget_closed -eq 1 ]; then
+        eww open lyrics-single
+    fi
 }
 
-if [ -z "$1" ]; then
+if [ "$1" = "restart" ]; then
     close
     while pgrep -x "waybar" >/dev/null; do
         sleep 0.2
     done
     open
-elif [ "$1" = "close" ]; then
-    if ! pgrep -x "waybar" >/dev/null; then
-        exit 1
-    fi
+elif pgrep -x "waybar" >/dev/null; then
     close
-elif [ "$1" = "open" ]; then
-    if pgrep -x "waybar" >/dev/null; then
-        exit 1
-    fi
+elif ! pgrep -x "waybar" >/dev/null; then
     open
 else
-    echo "Usage: $0 [close|open]"
+    echo "Usage: $0 [restart]"
     exit 1
 fi
diff --git a/backgrounds b/backgrounds
index 0c0828a..ca0b30c 160000
--- a/backgrounds
+++ b/backgrounds
@@ -1 +1 @@
-Subproject commit 0c0828a37f153d2ce7cf12acf47d46bd3d6e3a4e
+Subproject commit ca0b30cc48baf5f077aa098fc8b8ceec19efdc4e
diff --git a/hypr/hyprland/keybinds.conf b/hypr/hyprland/keybinds.conf
index be62a80..0105dc7 100755
--- a/hypr/hyprland/keybinds.conf
+++ b/hypr/hyprland/keybinds.conf
@@ -10,7 +10,7 @@ bind = Super, X, exec, gnome-text-editor # Launch Text Editor
 bind = Super, B, exec, killall btop || ghostty -e btop # Launch btop (system monitor)
 bind = Super, Space, exec, eww open main --toggle # Launch dashboard (eww)
 bind = Super+Shift, V, exec, pavucontrol # Launch pavucontrol (volume mixer)
-bind = Super+Shift, K, exec, waybar-toggle close || waybar-toggle open # Toggle waybar
+bind = Super+Shift, K, exec, waybar-toggle # Toggle waybar
 bind = Super+Shift, L, exec, lyrics-widgets # Toggle lyrics player
 bind = Super+Shift, F, exec, coin # Flip a coin