Merge branch 'dev-hypridle' into main

7 files changed, 54 insertions, 27 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 8681eb30..d171b599 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -14,15 +14,14 @@ env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 
-# vulkan
-#env = WLR_RENDERER,vulkan
-
 # 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/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..734a7056 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -5,7 +5,20 @@
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
 
-windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol)$
+# windowrule center
+windowrule = center,^(pavucontrol)
+windowrule = center,^([Ww]hatsapp-for-linux)$
+windowrule = center,^([Ff]erdium)$
+
+# WINDOWRULE v2
+# windowrule v2 - position
+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 +31,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)$
@@ -33,7 +48,7 @@ windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
 windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
 windowrulev2 = float, class:^([Rr]ofi)$
 windowrulev2 = float, class:^(eog)$
-windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol)$
+windowrulev2 = float, class:^(pavucontrol)$
 windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct|mpv)$
 windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
 windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ # system monitor
@@ -45,10 +60,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 +93,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 +103,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..c1f70c5e 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
+bindl = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
+bindl = , 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/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 f8542f64..a871cc75 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -2,4 +2,6 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # For Hyprlock
+
 pidof hyprlock || hyprlock -q --immediate
+