Merge pull request #200 from JaKooLit/development

Development to Main v2.2.7

6 files changed, 32 insertions, 14 deletions

diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 0a8b9d1d..6d13c8c2 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -11,6 +11,8 @@ windowrule = float, zoom
 windowrule = float, rofi
 windowrule = float, gnome-system-monitor
 windowrule = float, yad
+windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
+windowrule = float, ^(evince)$ # document viewer
 
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
@@ -48,6 +50,14 @@ 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.94 0.86, class:^(discord)$
+windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
 
 
 #layerrule = unset,class:^([Rr]ofi)$
diff --git a/config/hypr/UserScripts/Sounds.sh b/config/hypr/UserScripts/Sounds.sh
index 7c9100d5..fb8a1f57 100755
--- a/config/hypr/UserScripts/Sounds.sh
+++ b/config/hypr/UserScripts/Sounds.sh
@@ -31,8 +31,12 @@ else
 fi
 
 # Set the directory defaults for system sounds.
+if [ -d "/run/current-system/sw/share/sounds" ]; then
+    systemDIR="/run/current-system/sw/share/sounds" # NixOS
+else
+    systemDIR="/usr/share/sounds"
+fi
 userDIR="$HOME/.local/share/sounds"
-systemDIR="/usr/share/sounds"
 defaultTheme="freedesktop"
 
 # Prefer the user's theme, but use the system's if it doesn't exist.
@@ -62,4 +66,4 @@ if ! test -f "$sound_file"; then
         fi
     fi
 fi
-pw-play "$sound_file"
+pw-play "$sound_file"
\ No newline at end of file
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index 60eff33d..4c51ee8a 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -2,12 +2,12 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi Emoticons. Not my own. Cant remember the source
 
-sed '1,/^### DATA ###$/d' $0 | 
+sed '1,/^# # DATA # #$/d' $0 | 
 rofi -dmenu -config ~/.config/rofi/config-long.rasi| 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
-#  DATA #
+# # DATA # #
 😀 grinning face face smile happy joy :D grin
 😃 grinning face with big eyes face happy joy haha :D :) smile funny
 😄 grinning face with smiling eyes face happy joy funny haha laugh like :D :) smile
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index b280493e..0145e262 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -38,8 +38,8 @@ next_index=$(( (current_index + 1) % layout_count ))
 new_layout="${layout_mapping[next_index]}"
 
 # Update the keyboard layout
-hyprctl keyword input:kb_layout "$new_layout"
+hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
 echo "$new_layout" > "$layout_f"
 
 # Notification for the new keyboard layout
-notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
\ No newline at end of file
+notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh
index e8612c38..37a0603b 100755
--- a/config/hypr/scripts/Volume.sh
+++ b/config/hypr/scripts/Volume.sh
@@ -42,17 +42,19 @@ notify_user() {
 # Increase Volume
 inc_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
-        pamixer -u && notify_user
+        toggle_mute
+    else
+        pamixer -i 5 && notify_user
     fi
-    pamixer -i 5 && notify_user
 }
 
 # Decrease Volume
 dec_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
-        pamixer -u && notify_user
+        toggle_mute
+    else
+        pamixer -d 5 && notify_user
     fi
-    pamixer -d 5 && notify_user
 }
 
 # Toggle Mute
@@ -102,17 +104,19 @@ notify_mic_user() {
 # Increase MIC Volume
 inc_mic_volume() {
     if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        pamixer --default-source -u && notify_mic_user
+        toggle_mic
+    else
+        pamixer --default-source -i 5 && notify_mic_user
     fi
-    pamixer --default-source -i 5 && notify_mic_user
 }
 
 # Decrease MIC Volume
 dec_mic_volume() {
     if [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-        pamixer --default-source -u && notify_mic_user
+        toggle-mic
+    else
+        pamixer --default-source -d 5 && notify_mic_user
     fi
-    pamixer --default-source -d 5 && notify_mic_user
 }
 
 # Execute accordingly
diff --git a/config/hypr/v2.2.6 b/config/hypr/v2.2.7
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.6
+++ b/config/hypr/v2.2.7