Merge pull request #532 from JaKooLit/main

main to development synchronization

15 files changed, 39 insertions, 33 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 831f3afd..e5e5ab42 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -58,7 +58,7 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 
 # FOR VM and POSSIBLY NVIDIA
 # LIBGL_ALWAYS_SOFTWARE software mesa rendering
-#env = LIBGL_ALWAYS_SOFTWARE,1 
+#env = LIBGL_ALWAYS_SOFTWARE,1 # Warning. May cause hyprland to crash
 #env = WLR_RENDERER_ALLOW_SOFTWARE,1
 
 # nvidia firefox (for hardware acceleration on FF)?
diff --git a/config/hypr/UserConfigs/UserDecorAnimations.conf b/config/hypr/UserConfigs/UserDecorAnimations.conf
index b8aa2ce8..2a75cdd8 100644
--- a/config/hypr/UserConfigs/UserDecorAnimations.conf
+++ b/config/hypr/UserConfigs/UserDecorAnimations.conf
@@ -45,6 +45,7 @@ decoration {
     ignore_opacity = true
     new_optimizations = true
     special = true
+    popups = true
   }
 }
 
@@ -79,4 +80,4 @@ animations {
   # animations for -git or version >0.42.0
   animation = workspacesIn, 1, 5, winIn, slide
   animation = workspacesOut, 1, 5, winOut, slide
-}
+}
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 690eb624..05d93c07 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -1,4 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# For window rules and layerrules
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
 #windowrule = noblur,gamescope
@@ -138,9 +139,13 @@ windowrulev2 = keepaspectratio, title:^(Picture-in-Picture)$
 #windowrulev2 = opacity 0.8 0.8, pinned:1
 
 
-# LAYER RULES 
+# LAYER RULES
+layerrule = blur, rofi
+layerrule = ignorezero, rofi
+
+#layerrule = ignorezero, class:^([Rr]ofi)$
+#layerrule = blur, class:^([Rr]ofi)$
 #layerrule = unset,class:^([Rr]ofi)$
-#layerrule = blur,class:^([Rr]ofi)$
 #layerrule = ignorezero, <rofi>
 
 #layerrule = ignorezero, overview
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 54064752..919eafc3 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -92,7 +92,7 @@ play_online_music() {
 }
 
 # Check if an online music process is running and send a notification, otherwise run the main function
-pkill mpv && notify-send -u low -i "$iDIR/music.png" " Music stopped" || {
+pkill mpv && notify-send -u low -i "$iDIR/music.png" "Music stopped" || {
 
 # Check if rofi is already running
 if pidof rofi > /dev/null; then
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 08eaf924..1e84742b 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -49,7 +49,7 @@ no-effects() {
 	sleep 2
 	"$SCRIPTSDIR/Refresh.sh"
 
-    notify-send -u low -i "$iDIR/bell.png" " No wallpaper effects"
+    notify-send -u low -i "$iDIR/bell.png" "No wallpaper" "effects applied"
     # copying wallpaper for rofi menu
     cp "$current_wallpaper" "$wallpaper_output"
 }
@@ -71,7 +71,7 @@ main() {
             no-effects
         elif [[ "${effects[$choice]+exists}" ]]; then
             # Apply selected effect
-            notify-send -u normal -i "$iDIR/bell.png"  " Applying:" " $choice effects"
+            notify-send -u normal -i "$iDIR/bell.png"  "Applying:" "$choice effects"
             eval "${effects[$choice]}"
             # Wait for effects to be applied
             sleep 1
@@ -85,7 +85,7 @@ main() {
             sleep 0.5
             # Refresh rofi, waybar, wallust palettes
             "${SCRIPTSDIR}/Refresh.sh"
-            notify-send -u low -i "$iDIR/bell.png" " $choice effects" " applied"
+            notify-send -u low -i "$iDIR/bell.png" "$choice" "effects applied"
         else
             echo "Effect '$choice' not recognized."
         fi
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index 7fe7eb39..5132cd66 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -29,7 +29,7 @@ main() {
 
     # if nothing selected, script won't change anything
     if [ -z "$choice" ]; then
-        notify-send -u low -i "$iDIR/bell.png" " No theme selected." " No changes made!"
+        notify-send -u low -i "$iDIR/bell.png" "No theme selected." "No changes made!"
         exit 0
     fi
 
@@ -40,18 +40,18 @@ main() {
         # Pick a random theme from the original themes_array (excluding "Random")
         random_theme=${themes_array[$((RANDOM % (${#themes_array[@]} - 1) + 1))]}
         theme_to_set="$random_theme"
-        notify-send -i "$iDIR/bell.png" " Random theme selected: $random_theme"
+        notify-send -i "$iDIR/bell.png" "Random theme:" "selected: $random_theme"
     else
         # Set theme to the selected choice
         theme_to_set="$choice"
-        notify-send -i "$iDIR/bell.png" " Theme selected: $choice"
+        notify-send -i "$iDIR/bell.png" "Theme selected:" "$choice"
     fi
 
     if [ -f "$zsh_path" ]; then
         sed -i "s/^$var_name=.*/$var_name=\"$theme_to_set\"/" "$zsh_path"
-        notify-send -i "$iDIR/bell.png" " OMZ Theme updated" " restart your terminal"
+        notify-send -i "$iDIR/bell.png" "OMZ theme" "applied. restart your terminal"
     else
-        notify-send " Error: .zshrc file not found!"
+        notify-send "Error:" "~.zshrc file not found!"
     fi
 }
 
diff --git a/config/hypr/scripts/AirplaneMode.sh b/config/hypr/scripts/AirplaneMode.sh
index 89546e76..93526b66 100755
--- a/config/hypr/scripts/AirplaneMode.sh
+++ b/config/hypr/scripts/AirplaneMode.sh
@@ -9,8 +9,8 @@ wifi_blocked=$(rfkill list wifi | grep -o "Soft blocked: yes")
 
 if [ -n "$wifi_blocked" ]; then
     rfkill unblock wifi
-    notify-send -u low -i "$notif" " Airplane mode:" " Switched OFF"
+    notify-send -u low -i "$notif" " Airplane" " mode: OFF"
 else
     rfkill block wifi
-    notify-send -u low -i "$notif" " Airplane mode:" " Switched ON"
+    notify-send -u low -i "$notif" " Airplane" " mode: ON"
 fi
diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh
index 4578e509..8e5d525a 100755
--- a/config/hypr/scripts/Brightness.sh
+++ b/config/hypr/scripts/Brightness.sh
@@ -29,7 +29,7 @@ get_icon() {
 
 # Notify
 notify_user() {
-	notify-send -e -h string:x-canonical-private-synchronous:brightness_notif -h int:value:$current -u low -i "$icon" " Screen Brightness:" " $current %"
+	notify-send -e -h string:x-canonical-private-synchronous:brightness_notif -h int:value:$current -u low -i $icon "Screen" "Brightness:$current%"
 }
 
 # Change brightness
diff --git a/config/hypr/scripts/BrightnessKbd.sh b/config/hypr/scripts/BrightnessKbd.sh
index 67f8b87e..4c56bc03 100755
--- a/config/hypr/scripts/BrightnessKbd.sh
+++ b/config/hypr/scripts/BrightnessKbd.sh
@@ -26,7 +26,7 @@ get_icon() {
 }
 # Notify
 notify_user() {
-	notify-send -e -h string:x-canonical-private-synchronous:brightness_notif -h int:value:$current -u low -i "$icon" " Keyboard Brightness:" " $current%"
+	notify-send -e -h string:x-canonical-private-synchronous:brightness_notif -h int:value:$current -u low -i "$icon" "Keyboard" "Brightness:$current%"
 }
 
 # Change brightness
diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh
index 7bad0909..7ab6f451 100755
--- a/config/hypr/scripts/GameMode.sh
+++ b/config/hypr/scripts/GameMode.sh
@@ -19,7 +19,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then
 	
 	hyprctl keyword "windowrule opacity 1 override 1 override 1 override, ^(.*)$"
     swww kill 
-    notify-send -e -u low -i "$notif" " gamemode enabled" " All animations: OFF"
+    notify-send -e -u low -i "$notif" " Gamemode:" " enabled"
     exit
 else
 	swww-daemon --format xrgb && swww img "$HOME/.config/rofi/.current_wallpaper" &
@@ -27,7 +27,7 @@ else
 	${SCRIPTSDIR}/WallustSwww.sh
 	sleep 0.5
 	${SCRIPTSDIR}/Refresh.sh	 
-    notify-send -e -u normal -i "$notif" " gamemode enabled" " All animations: normal"
+    notify-send -e -u normal -i "$notif" " Gamemode:" " disabled"
     exit
 fi
 hyprctl reload
diff --git a/config/hypr/scripts/MediaCtrl.sh b/config/hypr/scripts/MediaCtrl.sh
index f519340f..2cbeccf3 100755
--- a/config/hypr/scripts/MediaCtrl.sh
+++ b/config/hypr/scripts/MediaCtrl.sh
@@ -25,7 +25,7 @@ toggle_play_pause() {
 # Stop playback
 stop_playback() {
     playerctl stop
-    notify-send -e -u low -i "$music_icon" " Playback Stopped"
+    notify-send -e -u low -i $music_icon " Playback:" " Stopped"
 }
 
 # Display notification with song information
@@ -34,9 +34,9 @@ show_music_notification() {
     if [[ "$status" == "Playing" ]]; then
         song_title=$(playerctl metadata title)
         song_artist=$(playerctl metadata artist)
-        notify-send -e -u low -i "$music_icon" " Now Playing:" " $song_title by $song_artist"
+        notify-send -e -u low -i $music_icon "Now Playing:" "$song_title by $song_artist"
     elif [[ "$status" == "Paused" ]]; then
-        notify-send -e -u low -i "$music_icon" " Playback Paused"
+        notify-send -e -u low -i $music_icon " Playback:" " Paused"
     fi
 }
 
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index 3fdd15b8..e0df2b86 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -53,7 +53,7 @@ notify_view() {
         local check_file="${dir}/${file}"
         if [[ -e "$check_file" ]]; then
             "${sDIR}/Sounds.sh" --screenshot
-            resp=$(timeout 5 ${notify_cmd_shot} " Screenshot Saved")
+            resp=$(timeout 5 ${notify_cmd_shot} " Screenshot" " Saved")
 			case "$resp" in
 				action1)
 					xdg-open "${check_file}" &
@@ -63,7 +63,7 @@ notify_view() {
 					;;
 			esac
         else
-            ${notify_cmd_shot} " Screenshot NOT Saved"
+            ${notify_cmd_shot} " Screenshot" " NOT Saved"
             "${sDIR}/Sounds.sh" --error
         fi
     fi
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 95e6edc8..f1f8b244 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -97,7 +97,7 @@ if ! change_layout; then
     echo "Layout change failed." >&2
     exit 1
 else
-    notify-send -u low -i "$notif_icon" " New kb_layout: $new_layout"
+    notify-send -u low -i "$notif_icon" " kb_layout: $new_layout"
     echo "Layout change notification sent."
 fi
 
diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh
index 22dd241b..5174968e 100755
--- a/config/hypr/scripts/TouchPad.sh
+++ b/config/hypr/scripts/TouchPad.sh
@@ -11,13 +11,13 @@ export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
 
 enable_touchpad() {
     printf "true" >"$STATUS_FILE"
-    notify-send -u low -i $notif  " Enabling touchpad"
+    notify-send -u low -i $notif  " Enabling" " touchpad"
     hyprctl keyword '$TOUCHPAD_ENABLED' "true" -r
 }
 
 disable_touchpad() {
     printf "false" >"$STATUS_FILE"
-    notify-send -u low -i $notif " Disabling touchpad"
+    notify-send -u low -i $notif " Disabling" " touchpad"
     hyprctl keyword '$TOUCHPAD_ENABLED' "false" -r
 }
 
diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh
index ac1367b7..b205f8f9 100755
--- a/config/hypr/scripts/Volume.sh
+++ b/config/hypr/scripts/Volume.sh
@@ -11,7 +11,7 @@ get_volume() {
     if [[ "$volume" -eq "0" ]]; then
         echo "Muted"
     else
-        echo "$volume%"
+        echo "$volume %"
     fi
 }
 
@@ -34,7 +34,7 @@ notify_user() {
     if [[ "$(get_volume)" == "Muted" ]]; then
         notify-send -e -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" " Volume:" " Muted"
     else
-        notify-send -e -h int:value:"$(get_volume | sed 's/%//')" -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" " Volume:" " $(get_volume) %" &&
+        notify-send -e -h int:value:"$(get_volume | sed 's/%//')" -h string:x-canonical-private-synchronous:volume_notif -u low -i "$(get_icon)" " Volume Level:" " $(get_volume)" &&
         "$sDIR/Sounds.sh" --volume
     fi
 }
@@ -60,7 +60,7 @@ dec_volume() {
 # Toggle Mute
 toggle_mute() {
 	if [ "$(pamixer --get-mute)" == "false" ]; then
-		pamixer -m && notify-send -e -u low -i "$iDIR/volume-mute.png" " Muted"
+		pamixer -m && notify-send -e -u low -i "$iDIR/volume-mute.png" " Mute"
 	elif [ "$(pamixer --get-mute)" == "true" ]; then
 		pamixer -u && notify-send -e -u low -i "$(get_icon)" " Volume:" " Switched ON"
 	fi
@@ -90,7 +90,7 @@ get_mic_volume() {
     if [[ "$volume" -eq "0" ]]; then
         echo "Muted"
     else
-        echo "$volume%"
+        echo "$volume %"
     fi
 }
 
@@ -98,7 +98,7 @@ get_mic_volume() {
 notify_mic_user() {
     volume=$(get_mic_volume)
     icon=$(get_mic_icon)
-    notify-send -e -h int:value:"$volume" -h "string:x-canonical-private-synchronous:volume_notif" -u low -i "$icon"  " Mic-Level:" " $volume %"
+    notify-send -e -h int:value:"$volume" -h "string:x-canonical-private-synchronous:volume_notif" -u low -i "$icon"  " Mic Level:" " $volume"
 }
 
 # Increase MIC Volume
@@ -140,4 +140,4 @@ elif [[ "$1" == "--mic-dec" ]]; then
 	dec_mic_volume
 else
 	get_volume
-fi
+fi
\ No newline at end of file