Merge pull request #549 from JaKooLit/main

main to development

6 files changed, 55 insertions, 55 deletions

diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 0ad5e0dc..783fa31a 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -20,8 +20,11 @@ wallust_config="$HOME/.config/wallust/wallust.toml"
 pallete_dark="dark16"
 pallete_light="light16"
 
-# kill swaybg if running
-pkill swaybg
+# intial kill process
+for pid in kitty waybar rofi swaync ags swaybg; do
+    killall -SIGUSR1 "$pid"
+done
+
 
 # Initialize swww if needed
 swww query || swww-daemon --format xrgb
@@ -89,14 +92,16 @@ else
 fi
 
 # ags color change
-if [ "$next_mode" = "Dark" ]; then
-    sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(0, 0, 0, 0.4);/' "${ags_style}"
-	sed -i '/@define-color text-color/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(255, 255, 255, 0.7);/' "${ags_style}"
-	sed -i '/@define-color noti-bg-alt/s/#.*;/#111111;/' "${ags_style}"
-else
-    sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(255, 255, 255, 0.4);/' "${ags_style}"
-    sed -i '/@define-color text-color/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(0, 0, 0, 0.7);/' "${ags_style}"
-	sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${ags_style}"
+if command -v ags >/dev/null 2>&1; then    
+    if [ "$next_mode" = "Dark" ]; then
+        sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(0, 0, 0, 0.4);/' "${ags_style}"
+	    sed -i '/@define-color text-color/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(255, 255, 255, 0.7);/' "${ags_style}" 
+	    sed -i '/@define-color noti-bg-alt/s/#.*;/#111111;/' "${ags_style}"
+    else
+        sed -i '/@define-color noti-bg/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(255, 255, 255, 0.4);/' "${ags_style}"
+        sed -i '/@define-color text-color/s/rgba([0-9]*,\s*[0-9]*,\s*[0-9]*,\s*[0-9.]*);/rgba(0, 0, 0, 0.7);/' "${ags_style}"
+	    sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${ags_style}"
+    fi
 fi
 
 # kitty background color change
@@ -110,11 +115,6 @@ else
 	sed -i '/^cursor /s/^cursor .*/cursor #000000/' "${kitty_conf}"
 fi
 
-for pid in $(pidof kitty); do
-    kill -SIGUSR1 "$pid"
-done
-
-
 # Set Dynamic Wallpaper for Dark or Light Mode
 if [ "$next_mode" = "Dark" ]; then
     next_wallpaper="$(find "${dark_wallpapers}" -type f \( -iname "*.jpg" -o -iname "*.png" \) -print0 | shuf -n1 -z | xargs -0)"
@@ -233,20 +233,18 @@ update_theme_mode
 
 ${SCRIPTSDIR}/WallustSwww.sh &&
 
-# some process to kill
-_ps=(waybar rofi swaync ags swaybg)
-for _prs in "${_ps[@]}"; do
-    if pidof "${_prs}" >/dev/null; then
-        pkill "${_prs}"
-    fi
+sleep 2
+# kill process
+for pid1 in kitty waybar rofi swaync ags swaybg; do
+    killall "$pid1"
 done
 
-sleep 2
+sleep 1
 ${SCRIPTSDIR}/Refresh.sh 
 
-sleep 0.3
+sleep 0.5
 # Display notifications for theme and icon changes 
-notify-send -u normal -i "$notif" " Themes switched to:" " $next_mode Mode"
+notify-send -u low -i "$notif" " Themes switched to:" " $next_mode Mode"
 
 exit 0
 
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index c8c46695..b041b19b 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -22,33 +22,30 @@ for _prs in "${_ps[@]}"; do
     fi
 done
 
-killall -SIGUSR2 waybar # added since wallust sometimes not applying
+# added since wallust sometimes not applying
+killall -SIGUSR2 waybar 
+killall -SIGUSR2 swaync
 
 # quit ags & relaunch ags
-#ags -q && ags &
+ags -q && ags &
 
-# Kill waybar & swaync (yet again) # added since wallust sometimes not applying
-_ps2=(waybar swaync)
-for _prs2 in "${_ps2[@]}"; do
-    if pidof "${_prs2}" >/dev/null; then
-        killall "${_prs2}"
-    fi
+# some process to kill
+for pid in $(pidof waybar rofi swaync ags swaybg); do
+    kill -SIGUSR1 "$pid"
 done
 
-# relaunch swaync
-sleep 0.5
-swaync > /dev/null 2>&1 &
-
 #Restart waybar
 sleep 1
 waybar &
 
+# relaunch swaync
+sleep 0.5
+swaync > /dev/null 2>&1 &
+
 # Relaunching rainbow borders if the script exists
 sleep 1
 if file_exists "${UserScripts}/RainbowBorders.sh"; then
     ${UserScripts}/RainbowBorders.sh &
 fi
 
-
-
 exit 0
\ No newline at end of file
diff --git a/config/swaync/style.css b/config/swaync/style.css
index d18f3756..a9dc328f 100755
--- a/config/swaync/style.css
+++ b/config/swaync/style.css
@@ -6,10 +6,9 @@
 @define-color noti-border-color @color12;
 @define-color noti-bg rgba(0, 0, 0, 0.8);
 @define-color noti-bg-alt #111111;
-@define-color noti-bg-hover @color11;
+@define-color noti-bg-hover @background;
 @define-color text-color @foreground;
-@define-color text-color-alt @foreground;
-@define-color text-color-disabled rgba(150, 150, 150, 0.8);
+
 * {
     font-family: "JetBrains Mono Nerd Font";
     font-weight: bold;
@@ -32,7 +31,7 @@
 }
 
 .notification-content{
-	color: @foreground;
+	/*color: @text-color;*/
     background: @noti-bg;
     padding: 3px 10px 3px 6px;
     border-radius: 10px;
@@ -74,9 +73,10 @@
 .notification-default-action:hover,
 .notification-action:hover {
     color: @text-color;
-    background: @color1
+    background: @noti-bg
 }
 
+
 .notification-default-action {
     border-radius: 10px;
     margin: 5px;
@@ -120,7 +120,7 @@
 
 .inline-reply-button:disabled {
     background: initial;
-    color: @text-color-disabled;
+    color: @text-color;
     border: 1px solid transparent
 }
 
@@ -130,7 +130,7 @@
 
 .body-image {
     margin-top: 6px;
-    color: @text-color-alt;
+    color: @text-color;
     border-radius: 10px
 }
 
@@ -138,7 +138,7 @@
     font-size: 1rem;
     font-weight: bold;
     background: transparent;
-    color: @text-color-alt;
+    color: @text-color;
     text-shadow: none
 }
 
@@ -161,7 +161,7 @@
 
 .control-center {
     background: @noti-bg;
-    border: 1.5px solid @noti-border-color;
+    border: 1px solid @noti-border-color;
 	color: @text-color;
     border-radius: 10px;
 }
@@ -183,7 +183,7 @@
 }
 
 .widget-title {
-    color: @noti-border-color;
+    color: @text-color;
     background: @noti-bg-alt;
     padding: 3px 6px;
     margin: 5px;
@@ -199,9 +199,10 @@
 	border: 0.5px solid @noti-border-color;
 }
 
+/* clear button */
 .widget-title>button:hover {
-    background: #f7768e;
-    color: @noti-border-color;
+    background: @text-color;
+    color: red;
 }
 
 .widget-dnd {
@@ -215,7 +216,7 @@
 
 .widget-dnd>switch {
     border-radius: 10px;
-    /* border: 1px solid #7aa2f7; */
+    border: 1px solid #7aa2f7;
     background: @noti-border-color;
 }
 
@@ -245,7 +246,7 @@
 
 .widget-mpris {
     color: @text-color;
-    background: @noti-bg-alt;
+    background: @noti-bg;
     padding: 3px 6px;
     margin: 5px;
     border-radius: 10px;
@@ -285,8 +286,9 @@
     color: @text-color
 }
 
+/* individual buttons */
 .widget-buttons-grid>flowbox>flowboxchild>button:hover {
-    background: @noti-border-color;
+    background: @text-color;
     color: @noti-bg-hover
 }
 
diff --git a/config/waybar/ModulesWorkspaces b/config/waybar/ModulesWorkspaces
index 79a5eeae..f6071a69 100644
--- a/config/waybar/ModulesWorkspaces
+++ b/config/waybar/ModulesWorkspaces
@@ -175,6 +175,9 @@
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces": {
+		"*": 5
+	  },
 	"format": "{icon} {windows}",
 	"format-window-separator": " ",
 	"window-rewrite-default": " ",
diff --git a/config/waybar/configs/[TOP] Default Laptop_v5 b/config/waybar/configs/[TOP] Default Laptop_v5
index 9e9febc1..2ef7b933 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v5
+++ b/config/waybar/configs/[TOP] Default Laptop_v5
@@ -34,7 +34,7 @@
 	"custom/separator#blank",
 	"custom/swaync",
 	"custom/separator#dot-line",
-	"hyprland/workspaces#numbers",
+	"hyprland/workspaces#rw",
 	"clock",
 	"custom/separator#dot-line",
 	"custom/weather",
diff --git a/config/waybar/configs/[TOP] Default_v5 b/config/waybar/configs/[TOP] Default_v5
index 4c6a5aba..a8a9601a 100644
--- a/config/waybar/configs/[TOP] Default_v5
+++ b/config/waybar/configs/[TOP] Default_v5
@@ -34,7 +34,7 @@
 	"custom/separator#blank",
 	"custom/swaync",
 	"custom/separator#dot-line",
-	"hyprland/workspaces#numbers",
+	"hyprland/workspaces#rw",
 	"clock",
 	"custom/separator#dot-line",
 	"custom/weather",