18 files changed, 79 insertions, 32 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index ee387d8f..86e40ba9 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -35,7 +35,7 @@ exec-once = wl-paste --type image --watch cliphist store
 exec-once = $UserScripts/RainbowBorders.sh
 
 # Starting hypridle to start hyprlock
-exec-once = hypridle -q
+exec-once = hypridle
 
 # Here are list of features available but disabled by default
 # exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 6d13c8c2..38d41222 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -13,7 +13,7 @@ windowrule = float, gnome-system-monitor
 windowrule = float, yad
 windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
 windowrule = float, ^(evince)$ # document viewer
-
+windowrule = float, ^(file-roller)$ # archive manager
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
@@ -21,9 +21,10 @@ windowrule = float, ^(evince)$ # document viewer
 windowrule = center,^(pavucontrol) 
 
 # windowrule v2
-windowrulev2 = workspace 1, class:^(thunderbird)$
-windowrulev2 = workspace 2, class:^(firefox)$
-windowrulev2 = workspace 2, class:^(Firefox-esr)$
+windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
+windowrulev2 = workspace 2, class:^([Ff]irefox)$
+windowrulev2 = workspace 2, class:^(org.mozilla.firefox)$
+windowrulev2 = workspace 2, class:^([Ff]irefox-esr)$
 windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
 windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
@@ -34,15 +35,32 @@ windowrulev2 = workspace 7 silent, class:^(discord)$
 windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
+# windowrule v2 - float
+windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
+windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
+windowrulev2 = float, class:(xdg-desktop-portal-gtk)
+windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
+
 #opacity (transparent) #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$
-windowrulev2 = opacity 0.9 0.7, class:^(firefox)$
-windowrulev2 = opacity 0.9 0.7, class:^(Firefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox)$
+windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$
+windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-stable)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-beta)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-beta)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-unstable)$
+windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
 windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
+windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
+windowrulev2 = opacity 0.9 0.8, class:^(Alacritty)$
 windowrulev2 = opacity 0.9 0.8, class:^(kitty)$
 windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
 windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$
@@ -50,14 +68,15 @@ windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
 windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
-windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(code-url-handler)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode)$
+windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio
 windowrulev2 = opacity 0.94 0.86, class:^(discord)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$
 windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
+windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 
 
 #layerrule = unset,class:^([Rr]ofi)$
@@ -79,4 +98,4 @@ windowrulev2=float, title:^(Picture-in-Picture)$
 windowrulev2=size 25% 25%,title:^(Picture-in-Picture)$ 
 #windowrulev2=size 25% 25%,title:^(Firefox)$ 
 windowrulev2=move 72% 7%,title:^(Picture-in-Picture)$ 
-#windowrulev2=move 72% 7%,title:^(Firefox)$ 
\ No newline at end of file
+#windowrulev2=move 72% 7%,title:^(Firefox)$ 
diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf
new file mode 100644
index 00000000..8e98244a
--- /dev/null
+++ b/config/hypr/UserConfigs/WorkspaceRules.conf
@@ -0,0 +1,20 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+# You can set workspace rules to achieve workspace-specific behaviors. 
+# For instance, you can define a workspace where all windows are drawn without borders or gaps.
+
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+
+# Assigning workspace to a certain monitor
+# workspace = 1, monitor:eDP-1
+# workspace = 2, monitor:DP-2
+
+
+# example rules (from wiki)
+# workspace = 3, rounding:false, decorate:false
+# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1
+# workspace = 8,bordersize:8
+# workspace = name:Hello, monitor:DP-1, default:true
+# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
+# workspace = 5, on-created-empty:[float] firefox
+# workspace = special:scratchpad, on-created-empty:foot
\ No newline at end of file
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index 658d7b03..af5c65d2 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -12,8 +12,9 @@ menu(){
   printf "5. view Monitors\n"
   printf "6. view Laptop-Keybinds\n"
   printf "7. view User-Settings\n"
-  printf "8. view Default-Settings\n"
-  printf "9. view Default-Keybinds\n"
+  printf "8. view Workspace-Rules\n"
+  printf "9. view Default-Settings\n"
+  printf "10. view Default-Keybinds\n"
 }
 
 main() {
@@ -41,9 +42,12 @@ main() {
             kitty -e nano "$UserConfigs/UserSettings.conf"
             ;;
         8)
+            kitty -e nano "$UserConfigs/WorkspaceRules.conf"
+            ;;
+		9)
             kitty -e nano "$configs/Settings.conf"
             ;;
-        9)
+        10)
             kitty -e nano "$configs/Keybinds.conf"
             ;;
         *)
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 16777f55..e3c79587 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -9,9 +9,11 @@ iDIR="$HOME/.config/swaync/icons"
 # Define menu options as an associative array
 declare -A menu_options=(
   ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio"
-  ["96.3 Easy Rock 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
-  ["Ghibli Music 🎻🎶"]="https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl"
+  ["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"
@@ -26,7 +28,7 @@ notification() {
 
 # Main function
 main() {
-  choice=$(printf "%s\n" "${!menu_options[@]}" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -i -p "")
+  choice=$(printf "%s\n" "${!menu_options[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -p "")
 
   if [ -z "$choice" ]; then
     exit 1
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 8aa9bdd8..de9c6546 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -25,7 +25,7 @@ RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME="${#PICS[@]}. random"
 
 # Rofi command
-rofi_command="rofi -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
+rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
 menu() {
   for i in "${!PICS[@]}"; do
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index 7057ed2e..46d2249e 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -5,7 +5,7 @@ file_extension=".zsh-theme"
 
 themes_array=($(find "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//"))
 
-rofi_command="rofi -dmenu -config ~/.config/rofi/config-zsh-theme.rasi"
+rofi_command="rofi -i -dmenu -config ~/.config/rofi/config-zsh-theme.rasi"
 
 menu() {
     for theme in "${themes_array[@]}"; do
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 343b887b..a8ae26f4 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -16,4 +16,5 @@ source= $UserConfigs/Laptops.conf
 source= $UserConfigs/LaptopDisplay.conf
 source= $UserConfigs/WindowRules.conf
 source= $UserConfigs/UserKeybinds.conf
-source= $UserConfigs/UserSettings.conf
\ No newline at end of file
+source= $UserConfigs/UserSettings.conf
+source= $UserConfigs/WorkspaceRules.conf
\ No newline at end of file
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 1e50cbd6..b2a1a163 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -38,7 +38,7 @@ input-field {
     placeholder_text = <i>Password...</i> # Text rendered in the input box when it's empty.
     hide_input = false
     
-    position = 0, 100
+    position = 0, 200
     halign = center
     valign = bottom
 }
@@ -64,7 +64,7 @@ label {
     font_size = 24
     font_family = JetBrains Mono Nerd Font 10
 
-    position = 0, -200
+    position = 0, -250
     halign = center
     valign = top
 }
@@ -78,7 +78,7 @@ text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
     font_size = 94
     font_family = JetBrains Mono Nerd Font 10
 
-    position = 0, -150
+    position = 0, 0
     halign = center
     valign = center
 }
@@ -90,7 +90,7 @@ label {
     font_size = 18
     font_family = Inter Display Medium
 
-    position = 0, 200
+    position = 0, 100
     halign = center
     valign = bottom
 }
@@ -126,7 +126,7 @@ image {
     border_color = $color12
     rotate = 0
     reload_time = -1
-    position = 0, 200
+    position = 0, 300
     halign = center
-    valign = center
+    valign = bottom
 }
\ No newline at end of file
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index f93005bc..ddce2999 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -8,7 +8,7 @@
 
 while true; do
     result=$(
-        rofi -dmenu \
+        rofi -i -dmenu \
             -kb-custom-1 "Control-Delete" \
             -kb-custom-2 "Alt-Delete" \
             -config ~/.config/rofi/config-clipboard.rasi < <(cliphist list)
diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/PywalSwww.sh
index fe067611..30a4d980 100755
--- a/config/hypr/scripts/PywalSwww.sh
+++ b/config/hypr/scripts/PywalSwww.sh
@@ -34,5 +34,5 @@ if [ "$ln_success" = true ]; then
     # wal -i "$wallpaper_path"
 	echo 'about to execute wal'
     # execute pywal skipping tty and terminal changes
-    wal -i "$wallpaper_path" -s -t &
+    wal -i "$wallpaper_path" -s -t -n -e &
 fi
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index 4c51ee8a..cf6bec55 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -3,7 +3,7 @@
 # Rofi Emoticons. Not my own. Cant remember the source
 
 sed '1,/^# # DATA # #$/d' $0 | 
-rofi -dmenu -config ~/.config/rofi/config-long.rasi| 
+rofi -i -dmenu -config ~/.config/rofi/config-long.rasi| 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index 309114dc..d2ee51a2 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -3,7 +3,7 @@
 # Screenshots scripts
 
 iDIR="$HOME/.config/swaync/icons"
-sDIR="$HOME/.config/hypr/UserScripts"
+sDIR="$HOME/.config/hypr/scripts"
 notify_cmd_shot="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"
 
 time=$(date "+%d-%b_%H-%M-%S")
diff --git a/config/hypr/UserScripts/Sounds.sh b/config/hypr/scripts/Sounds.sh
index fb8a1f57..a749114c 100755
--- a/config/hypr/UserScripts/Sounds.sh
+++ b/config/hypr/scripts/Sounds.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This script is used to play system sounds.
+# Script is used by Volume.Sh and ScreenShots.sh 
 
 theme="freedesktop" # Set the theme for the system sounds.
 mute=false          # Set to true to mute the system sounds.
diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh
index d2fef87e..19868caf 100755
--- a/config/hypr/scripts/Volume.sh
+++ b/config/hypr/scripts/Volume.sh
@@ -3,7 +3,7 @@
 # Scripts for volume controls for audio and mic 
 
 iDIR="$HOME/.config/swaync/icons"
-sDIR="$HOME/.config/hypr/UserScripts"
+sDIR="$HOME/.config/hypr/scripts"
 
 # Get Volume
 get_volume() {
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index a70953bb..03029889 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -38,7 +38,7 @@ restart_waybar_if_needed() {
 
 # Main function
 main() {
-    choice=$(menu | rofi -dmenu -config "$rofi_config")
+    choice=$(menu | rofi -i -dmenu -config "$rofi_config")
 
     if [[ -z "$choice" ]]; then
         echo "No option selected. Exiting."
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 4cd484b0..2e994780 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -40,7 +40,7 @@ restart_waybar_if_needed() {
 
 # Main function
 main() {
-    choice=$(menu | rofi -dmenu -config "$rofi_config")
+    choice=$(menu | rofi -i -dmenu -config "$rofi_config")
 
     if [[ -z "$choice" ]]; then
         echo "No option selected. Exiting."
diff --git a/config/hypr/v2.2.8 b/config/hypr/v2.2.10
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.8
+++ b/config/hypr/v2.2.10