Merge pull request #366 from JaKooLit/main

main to ags-dev

8 files changed, 74 insertions, 48 deletions

diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index fe5e92f0..47f88ed5 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -18,9 +18,8 @@ dwindle {
 }
 
 master {
-  #new_is_master=1 # comment this when Hyprland release a new version or you are running the git version
-  new_status=master # hyprland upstream or git version (next release maybe v0.41-2 or v0.42)
-  new_on_top=1
+  new_status = master #from Hyprland >v0.41.2
+  new_on_top = 1
   mfact = 0.5
 }
 
@@ -33,7 +32,7 @@ general {
 
   resize_on_border = true
    
-  col.active_border = $color0 $color2 $color9 $color12 $color15 90deg
+  col.active_border = $color12 
   col.inactive_border = $backgroundCol
 
   layout = dwindle
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 7e1a43a5..602531e1 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -68,6 +68,7 @@ windowrulev2 = float, class:^([Ff]erdium)$
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser)$
 windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 7a7ac3f5..aa9f62e8 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -10,18 +10,18 @@ iDIR="$HOME/.config/swaync/icons"
 
 # Online Stations. Edit as required
 declare -A online_music=(
-  ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ"
-  ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio"
-  ["Easy Rock 96.3 FM 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
-  ["Wish 107.5 FM 📻🎶"]="https://radio-stations-philippines.com/dwnu-1075-wish"
-  ["Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
-  ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
-  ["Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
-  ["Chillhop ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
-  ["SmoothChill ☕️🎶"]="https://media-ssl.musicradio.com/SmoothChill"
-  ["Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
-  ["Youtube Remix 📻🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0"
-  ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
+  ["Lofi Girl Radio ☕️🎶"]="https://play.streamafrica.net/lofiradio"
+  ["FM - Easy Rock 96.3 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
+  ["FM - WRock - CEBU 96.3 📻🎶"]="https://onlineradio.ph/126-96-3-wrock.html"
+  ["YT - Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
+  ["YT - Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
+  ["YT - Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
+  ["Chillhop Radio ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
+  ["FM - Fresh Philippines ☕️🎶"]="https://onlineradio.ph/553-fresh-fm.html"
+  ["YT - Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
+  ["YT - Youtube Remix 📻🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0"
+  ["YT - Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
+  ["YT - AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ"
 )
 
 # Populate local_music array with files from music directory and subdirectories
@@ -56,16 +56,9 @@ play_local_music() {
 		
 	    notification "$choice"
 
-      # For some reason wont start playlist at 0
-      if [[ $i -eq 0 ]]; then
-        # Play the selected local music file using mpv
-        mpv --loop-playlist --vid=no "$mDIR/$choice" 
-      	
-      else
-        file=$i
-        # Play the selected local music file using mpv
-        mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR/$choice"
-      fi
+      # Play the selected local music file using mpv
+      mpv --playlist-start="$i" --loop-playlist --vid=no  "${local_music[@]}"
+
       break
     fi
   done
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 06859112..d2ca7c28 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -33,8 +33,8 @@ rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 # Sorting Wallpapers
 menu() {
   sorted_options=($(printf '%s\n' "${PICS[@]}" | sort))
-  # Place ". random" at the beginning
-  printf "%s\n" "$RANDOM_PIC_NAME"
+  # Place ". random" at the beginning with the random picture as an icon
+  printf "%s\x00icon\x1f%s\n" "$RANDOM_PIC_NAME" "$RANDOM_PIC"
   for pic_path in "${sorted_options[@]}"; do
     pic_name=$(basename "$pic_path")
     # Displaying .gif to indicate animated images
@@ -59,7 +59,6 @@ main() {
 
   # Random choice case
   if [ "$choice" = "$RANDOM_PIC_NAME" ]; then
-    RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
     swww img -o $focused_monitor "${RANDOM_PIC}" $SWWW_PARAMS
     exit 0
   fi
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index e4362eab..42beb6b3 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -57,27 +57,40 @@ label {
     valign = top
 }
 
-# Week
+# Hour-Time
 label {
     monitor =
-    text = cmd[update:18000000] echo "<b> "$(date +'Week %U')" </b>"
-    color = $color5
-    font_size = 24
+    text = cmd[update:1000] echo -e "$(date +"%H")"
+#    text = cmd[update:1000] echo -e "$(date +"%I")" #AM/PM
+    color = rgba(255, 185, 0, .6)
+    font_size = 200
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold 
+    position = 0, 140
+    halign = center
+    valign = center
+}
+
+# Minute-Tine
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%M")"
+    color = rgba(255, 255, 255, .6)
+    font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
-    position = 0, -250
+    position = 0, -160
     halign = center
-    valign = top
+    valign = center
 }
 
-# Time
+# Minute-Tine
 label {
     monitor =
-    #text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM
-    text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
-    color = $color15
-    font_size = 150
-    font_family = AlfaSlabOne
-    position = 0, 0
+    text = cmd[update:1000] echo -e "$(date +"%S")"
+#    text = cmd[update:1000] echo -e "$(date +"%S %p")" #AM/PM
+    color = $color12
+    font_size = 40
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, 120
     halign = center
     valign = center
 }
diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh
index 8f9fbf22..d1f80932 100755
--- a/config/hypr/scripts/Brightness.sh
+++ b/config/hypr/scripts/Brightness.sh
@@ -4,15 +4,16 @@
 
 iDIR="$HOME/.config/swaync/icons"
 notification_timeout=1000
+step=10  # INCREASE/DECREASE BY THIS VALUE
 
 # Get brightness
 get_backlight() {
-	echo $(brightnessctl -m | cut -d, -f4)
+	brightnessctl -m | cut -d, -f4 | sed 's/%//'
 }
 
 # Get icons
 get_icon() {
-	current=$(get_backlight | sed 's/%//')
+	current=$(get_backlight)
 	if   [ "$current" -le "20" ]; then
 		icon="$iDIR/brightness-20.png"
 	elif [ "$current" -le "40" ]; then
@@ -33,7 +34,27 @@ notify_user() {
 
 # Change brightness
 change_backlight() {
-	brightnessctl set "$1" -n && get_icon && notify_user
+	local current_brightness
+	current_brightness=$(get_backlight)
+
+	# Calculate new brightness
+	if [[ "$1" == "+${step}%" ]]; then
+		new_brightness=$((current_brightness + step))
+	elif [[ "$1" == "${step}%-" ]]; then
+		new_brightness=$((current_brightness - step))
+	fi
+
+	# Ensure new brightness is within valid range
+	if (( new_brightness < 5 )); then
+		new_brightness=5
+	elif (( new_brightness > 100 )); then
+		new_brightness=100
+	fi
+
+	brightnessctl set "${new_brightness}%"
+	get_icon
+	current=$new_brightness
+	notify_user
 }
 
 # Execute accordingly
@@ -42,10 +63,10 @@ case "$1" in
 		get_backlight
 		;;
 	"--inc")
-		change_backlight "+10%"
+		change_backlight "+${step}%"
 		;;
 	"--dec")
-		change_backlight "10%-"
+		change_backlight "${step}%-"
 		;;
 	*)
 		get_backlight
diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh
index 5ad268ca..f8dc3505 100755
--- a/config/hypr/scripts/GameMode.sh
+++ b/config/hypr/scripts/GameMode.sh
@@ -20,7 +20,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then
     notify-send -e -u low -i "$notif" "gamemode enabled. All animations off"
     exit
 else
-	swww-daemon && swww img "$HOME/.config/rofi/.current_wallpaper" &
+	swww-daemon --format xrgb && swww img "$HOME/.config/rofi/.current_wallpaper" &
 	sleep 0.1
 	${SCRIPTSDIR}/WallustSwww.sh
 	sleep 0.5
diff --git a/config/hypr/v2.3 b/config/hypr/v2.3.1
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3
+++ b/config/hypr/v2.3.1