Merge pull request #321 from JaKooLit/development

Development to main

12 files changed, 93 insertions, 36 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 8681eb30..c6bea01b 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -14,15 +14,20 @@ env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 
-# vulkan
-#env = WLR_RENDERER,vulkan
+# xwayland apps scale fix (useful if you are use monitor scaling)
+# see https://wiki.hyprland.org/Configuring/XWayland/
+# toolkit-specific scale
+# env = GDK_SCALE,2 
+
 
 # firefox
 env = MOZ_ENABLE_WAYLAND,1
 
+# electron >28 apps (may help)
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+
 # NVIDIA 
 # This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected
-#env = WLR_NO_HARDWARE_CURSORS,1
 #env = LIBVA_DRIVER_NAME,nvidia 
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = GBM_BACKEND,nvidia-drm 
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index 00d8b8c6..2f1f2077 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -7,13 +7,13 @@ $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
 $UserConfigs = $HOME/.config/hypr/UserConfigs
 
-bind = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
-bind = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up
+binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
+binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up
 bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button
 bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile 
 bind = , xf86Launch4, exec, asusctl profile -n  #FN+F5 change of fan profiles (Quite, Balance, Performance)
-bind = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec 
-bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc 
+binde = , xf86MonBrightnessDown, exec, $scriptsDir/Brightness.sh --dec 
+binde = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc 
 bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad
 
 # Screenshot keybindings for Asus G15 (no PrinSrc button)
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 1ca9b5d8..be8e4845 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -146,3 +146,8 @@ binds {
 xwayland {
     force_zero_scaling = true
 }
+
+# cursor section for Hyprland v0.41.0 or newer
+#cursor {
+#	enable_hyprcursor = true
+#}
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 1e949eca..3fe8de77 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -5,7 +5,21 @@
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
 
-windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol)$
+# windowrule center
+windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol)
+windowrule = center,^([Ww]hatsapp-for-linux)$
+windowrule = center,^([Ff]erdium)$
+
+# WINDOWRULE v2
+# windowrule v2 - position
+windowrulev2 = center,floating:1
+windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
+windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
+
+# windowrule v2 to avoid idle for fullscreen apps
+windowrulev2 = idleinhibit fullscreen, class:^(*)$
+windowrulev2 = idleinhibit fullscreen, title:^(*)$
+windowrulev2 = idleinhibit fullscreen, fullscreen:1
 
 # windowrule v2 move to workspace
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
@@ -18,6 +32,8 @@ windowrulev2 = workspace 5, class:^([Ll]utris)$
 windowrulev2 = workspace 7, class:^([Dd]iscord)$
 windowrulev2 = workspace 7, class:^([Ww]ebCord)$
 windowrulev2 = workspace 7, class:^([Vv]esktop)$
+windowrulev2 = workspace 7, class:^([Ff]erdium)$
+windowrulev2 = workspace 7, class:^([Ww]hatsapp-for-linux)$
 
 # windowrule v2 move to workspace (silent)
 windowrulev2 = workspace 6 silent, class:^(virt-manager)$
@@ -45,10 +61,8 @@ windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analy
 windowrulev2 = float, title:(Kvantum Manager)
 windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$
 windowrulev2 = float, class:^([Qq]alculate-gtk)$
-
-# windowrule v2 - position
-windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
-windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
+windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
+windowrulev2 = float, class:^([Ff]erdium)$
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
@@ -80,6 +94,8 @@ windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui
+windowrulev2 = opacity 0.9 0.7, class:^([Ww]hatsapp-for-linux)$
+windowrulev2 = opacity 0.9 0.7, class:^([Ff]erdium)$
 
 # windowrule v2 - size
 windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
@@ -88,6 +104,8 @@ windowrulev2 = size 60% 70%, title:(Kvantum Manager)
 windowrulev2 = size 60% 70%, class:^(qt6ct)$
 windowrulev2 = size 70% 70%, class:^(evince|wihotspot-gui)$
 windowrulev2 = size 60% 70%, class:^(file-roller|org.gnome.FileRoller)$
+windowrulev2 = size 60% 70%, class:^([Ww]hatsapp-for-linux)$
+windowrulev2 = size 60% 70%, class:^([Ff]erdium)$
 
 #layerrule = unset,class:^([Rr]ofi)$
 #layerrule = blur,class:^([Rr]ofi)$
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 142de86a..a270ab6f 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -52,23 +52,27 @@ bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
 
 # group
 bind = $mainMod, G, togglegroup
-bind = ALT, tab, changegroupactive  #change focus to another window  
+bind = $mainMod SHIFT, tab, changegroupactive  #change focus to another window
+
+ # Cycle windows if floating bring to top
+bind = ALT,Tab,cyclenext
+bind = ALT,Tab,bringactivetotop  
 
 # Special Keys / Hot Keys
-bind = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
-bind = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec #volume down
-bind = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic #mute mic
-bind = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle
-bind = , xf86Sleep, exec, systemctl suspend  # sleep button 
-bind = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh #Airplane mode
+bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
+bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec #volume down
+bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic #mute mic
+bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle
+bindl = , xf86Sleep, exec, systemctl suspend  # sleep button 
+bindl = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh #Airplane mode
 
 # media controls using keyboards
-bind = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bind = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bind = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
-bind = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
-bind = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
-bind = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
+bindl = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
+bindl = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
+bindl = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
 
 # Screenshot keybindings NOTE: You may need to press Fn key as well
 bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
index 549f1b1c..b71c21df 100644
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@@ -4,13 +4,21 @@
                                                       
 
 general {
-    # lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session) 
-    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = hyprlock    # command ran before sleep
-    # after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
+    lock_cmd = pidof hyprlock || hyprlock # runs hyprlock if it is not already running (this is always run when "loginctl lock-session" is called) 
+    # unlock_cmd = killall hyprlock # kills hyprlock when unlocking (this is always run when "loginctl unlock-session" is called)
+    before_sleep_cmd = loginctl lock-session    # ensures that the session is locked before going to sleep
+    after_sleep_cmd = hyprctl dispatch dpms on # turn of screen after sleep (not strictly necessary, but just in case)
     ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
 }
 
+# turn off screen faster if session is already locked
+# (disabled by default)
+# listener {
+#     timeout = 30                            # 30 seconds
+#     on-timeout = pidof hyprlock && hyprctl dispatch dpms off # turns off the screen if hyprlock is active
+#     on-resume = pidof hyprlock && hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+# }
+
 # Warn
 listener {
     timeout = 540                            # 9 min
@@ -21,10 +29,18 @@ listener {
 # Screenlock
 listener {
     timeout = 600                     # 10 min
-    on-timeout = hyprlock # command to run when timeout has passed
+    on-timeout = loginctl lock-session # command to run when timeout has passed
     # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
 }
 
+# Turn off screen 
+# (disabled by default)
+# listener {
+#     timeout = 630                            # 10.5 min
+#     on-timeout = hyprctl dispatch dpms off  # command to run when timeout has passed
+#     on-resume = hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+# }
+
 # Suspend # disabled by default
 # listener {
    # timeout = 1200                            # 20 min
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 7c1af41a..c763bc90 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -73,8 +73,8 @@ label {
 # Time
 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
+    #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 = 94
     font_family = JetBrains Mono Nerd Font 10
diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh
index 7d43f570..8f9fbf22 100755
--- a/config/hypr/scripts/Brightness.sh
+++ b/config/hypr/scripts/Brightness.sh
@@ -33,7 +33,7 @@ notify_user() {
 
 # Change brightness
 change_backlight() {
-	brightnessctl set "$1" && get_icon && notify_user
+	brightnessctl set "$1" -n && get_icon && notify_user
 }
 
 # Execute accordingly
@@ -50,4 +50,4 @@ case "$1" in
 	*)
 		get_backlight
 		;;
-esac
\ No newline at end of file
+esac
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index ce2320ab..0fd62cab 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -2,4 +2,6 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # For Hyprlock
-hyprlock -q --immediate
\ No newline at end of file
+
+pidof hyprlock || hyprlock -q 
+
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index d2ee51a2..5d15ee68 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -22,6 +22,7 @@ notify_view() {
             "${sDIR}/Sounds.sh" --screenshot
         else
             ${notify_cmd_shot} "Screenshot of '${active_window_class}' not Saved"
+            "${sDIR}/Sounds.sh" --error
         fi
     elif [[ "$1" == "swappy" ]]; then
 		${notify_cmd_shot} "Screenshot Captured."
@@ -32,6 +33,7 @@ notify_view() {
             "${sDIR}/Sounds.sh" --screenshot
         else
             ${notify_cmd_shot} "Screenshot NOT Saved."
+            "${sDIR}/Sounds.sh" --error
         fi
     fi
 }
diff --git a/config/hypr/scripts/Sounds.sh b/config/hypr/scripts/Sounds.sh
index e19feea4..9ab9127d 100755
--- a/config/hypr/scripts/Sounds.sh
+++ b/config/hypr/scripts/Sounds.sh
@@ -26,8 +26,13 @@ elif [[ "$1" == "--volume" ]]; then
         exit 0
     fi
     soundoption="audio-volume-change.*"
+elif [[ "$1" == "--error" ]]; then
+    if [[ "$muteScreenshots" = true ]]; then
+        exit 0
+    fi
+    soundoption="dialog-error.*"
 else
-    echo -e "Available sounds: --screenshot, --volume"
+    echo -e "Available sounds: --screenshot, --volume, --error"
     exit 0
 fi
 
diff --git a/config/hypr/v2.2.12 b/config/hypr/v2.2.13
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.12
+++ b/config/hypr/v2.2.13