Merge pull request #537 from JaKooLit/development

Development to Main

3 files changed, 95 insertions, 74 deletions

diff --git a/config/hypr/UserConfigs/UserAnimations.conf b/config/hypr/UserConfigs/UserAnimations.conf
new file mode 100644
index 00000000..0f40b5e6
--- /dev/null
+++ b/config/hypr/UserConfigs/UserAnimations.conf
@@ -0,0 +1,26 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+animations {
+  enabled = yes
+
+  bezier = wind, 0.05, 0.9, 0.1, 1.05
+  bezier = winIn, 0.1, 1.1, 0.1, 1.1
+  bezier = winOut, 0.3, -0.3, 0, 1
+  bezier = liner, 1, 1, 1, 1
+  bezier = overshot, 0.05, 0.9, 0.1, 1.05
+  bezier = smoothOut, 0.5, 0, 0.99, 0.99
+  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
+  
+  animation = windows, 1, 6, wind, slide
+  animation = windowsIn, 1, 5, winIn, slide
+  animation = windowsOut, 1, 3, smoothOut, slide
+  animation = windowsMove, 1, 5, wind, slide
+  animation = border, 1, 1, liner
+  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
+  animation = fade, 1, 3, smoothOut
+  animation = workspaces, 1, 5, overshot
+  
+  # animations for -git or version >0.42.0
+  animation = workspacesIn, 1, 5, winIn, slide
+  animation = workspacesOut, 1, 5, winOut, slide
+}
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/UserDecorAnimations.conf b/config/hypr/UserConfigs/UserDecorations.conf
index 2a75cdd8..f076487c 100644
--- a/config/hypr/UserConfigs/UserDecorAnimations.conf
+++ b/config/hypr/UserConfigs/UserDecorations.conf
@@ -1,5 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Decoration and Animations Settings
+# Decoration Settings
 
 # Hyprland Wiki Links
 # Animation - https://wiki.hyprland.org/Configuring/Animations/
@@ -55,29 +55,4 @@ group {
 	groupbar {
 		col.active = $color0
   }
-}
-    
-animations {
-  enabled = yes
-
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
-  bezier = overshot, 0.05, 0.9, 0.1, 1.05
-  bezier = smoothOut, 0.5, 0, 0.99, 0.99
-  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
-  
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 5, winIn, slide
-  animation = windowsOut, 1, 3, smoothOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 3, smoothOut
-  animation = workspaces, 1, 5, overshot
-  
-  # animations for -git or version >0.42.0
-  animation = workspacesIn, 1, 5, winIn, slide
-  animation = workspacesOut, 1, 5, winOut, slide
 }
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 05d93c07..378e1048 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -2,22 +2,54 @@
 # For window rules and layerrules
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
-#windowrule = noblur,gamescope
-#windowrule = fullscreen,gamescope
-#windowrule = workspace 6 silent,^(gamescope)$
+# windowrule v2 - tags - add apps under appropriate tag to use the same settings
+# browser tags
+windowrulev2 = tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
+windowrulev2 = tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
+windowrulev2 = tag +browser, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable))$
+windowrulev2 = tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$
+windowrulev2 = tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$
+windowrulev2 = tag +browser, class:^(zen-alpha)$
 
-# windowrule Position
-windowrule = center,^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)
-windowrule = center,^([Ww]hatsapp-for-linux)$
-windowrule = center,^([Ff]erdium)$
+# email tags
+windowrulev2 = tag +email, class:^([Tt]hunderbird|org.gnome.Evolution)$
+windowrulev2 = tag +email, class:^(eu.betterbird.Betterbird)$
+
+# project tags
+windowrulev2 = tag +projects, class:^(codium|codium-url-handler|VSCodium)$
+windowrulev2 = tag +projects, class:^(VSCode|code-url-handler)$
+windowrulev2 = tag +projects, class:^(jetbrains-.+)$ # JetBrains IDEs
+
+# screenshare tags
+windowrulev2 = tag +screenshare, class:^(com.obsproject.Studio)$
+
+# IM tags
+windowrulev2 = tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
+windowrulev2 = tag +im, class:^([Ff]erdium)$
+windowrulev2 = tag +im, class:^([Ww]hatsapp-for-linux)$
+windowrulev2 = tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
+windowrulev2 = tag +im, class:^(teams-for-linux)$
+
+# game tags
+windowrulev2 = tag +games, class:^(gamescope)$
+windowrulev2 = tag +games, class:^(steam_app_\d+)$
+
+# gamestore tags
+windowrulev2 = tag +gamestore, class:^([Ss]team)$
+windowrulev2 = tag +gamestore, title:^([Ll]utris)$
+windowrulev2 = tag +gamestore, class:^(com.heroicgameslauncher.hgl)$
+
+# multimedia tags
+windowrulev2 = tag +multimedia, class:^([Aa]udacious)$
 
-# WINDOWRULE v2
 # windowrule v2 - position
 # windowrulev2 = center,floating:1 # warning, it cause even the menu to float and center.
-windowrulev2 = center, class:([Tt]hunar), title:(File Operation Progress)
-windowrulev2 = center, class:([Tt]hunar), title:(Confirm to replace files)
+windowrulev2 = center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)
 windowrulev2 = center, title:^(ROG Control)$
-windowrulev2 = center, title:^(Keybindings)$  
+windowrulev2 = center, title:^(Keybindings)$
+windowrulev2 = center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
+windowrulev2 = center, class:^([Ww]hatsapp-for-linux)$
+windowrulev2 = center, class:^([Ff]erdium)$
 windowrulev2 = move 72% 7%,title:^(Picture-in-Picture)$ 
 #windowrulev2 = move 72% 7%,title:^(Firefox)$ 
 
@@ -27,36 +59,24 @@ windowrulev2 = idleinhibit fullscreen, title:^(*)$
 windowrulev2 = idleinhibit fullscreen, fullscreen:1
 
 # windowrule v2 move to workspace
-windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
-windowrulev2 = workspace 1, class:^(eu.betterbird.Betterbird)$
-windowrulev2 = workspace 1, class:^(org.gnome.Evolution)$
-windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
-windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
-windowrulev2 = workspace 2, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
-windowrulev2 = workspace 2, class:^([Tt]horium-browser|[Cc]achy-browser)$
+windowrulev2 = workspace 1, tag:email*
+windowrulev2 = workspace 2, tag:browser*
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
-windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
-windowrulev2 = workspace 5, class:^([Ss]team)$
-windowrulev2 = workspace 5, class:^([Ll]utris)$
-windowrulev2 = workspace 7, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
-windowrulev2 = workspace 7, class:^([Ff]erdium)$
-windowrulev2 = workspace 7, class:^([Ww]hatsapp-for-linux)$
-windowrulev2 = workspace 7, class:^(teams-for-linux)$
+windowrulev2 = workspace 3, tag:projects*
+windowrulev2 = workspace 5, tag:gamestore*
+windowrulev2 = workspace 7, tag:im*
+windowrulev2 = workspace 8, tag:games*
 
 # windowrule v2 move to workspace (silent)
+windowrulev2 = workspace 4 silent, tag:screenshare*
 windowrulev2 = workspace 6 silent, class:^(virt-manager)$
 windowrulev2 = workspace 6 silent, class:^(.virt-manager-wrapped)$
-windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
+windowrulev2 = workspace 9 silent, tag:multimedia*
 
 # windowrule v2 - float
-windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ 
 windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$
-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)
-windowrulev2 = float, class:(codium|codium-url-handler|VSCodium|code-oss), title:(Add Folder to Workspace)
-windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
 windowrulev2 = float, class:^([Rr]ofi)$
 windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
 windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
@@ -64,13 +84,11 @@ windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct)$
 windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$
 windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
 windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
-windowrulev2 = float, class:^([Yy]ad)$ 
 windowrulev2 = float, class:^(wihotspot(-gui)?)$ # wifi hotspot
 windowrulev2 = float, class:^(evince)$ # document viewer
 windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
 windowrulev2 = float, title:(Kvantum Manager)
-windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$
 windowrulev2 = float, class:^([Qq]alculate-gtk)$
 #windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = float, class:^([Ff]erdium)$
@@ -79,29 +97,29 @@ windowrulev2 = float, title:^(ROG Control)$
 #windowrulev2 = float, title:^(Firefox)$
 windowrulev2 = float, title:^(hyprgui)$
 
+#windowrule v2 - float popups and dialogue
+windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = float, class:^([Yy]ad)$
+windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)
+windowrulev2 = float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)
+windowrulev2 = float, class:^([Ss]team)$, title:negative:^([Ss]team)$
+windowrulev2 = float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)
+windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
+
 # windowrule v2 - opacity #enable as desired
+windowrulev2 = opacity 0.9 0.7, tag:browser*
+windowrulev2 = opacity 0.9 0.8, tag:projects*
+windowrulev2 = opacity 0.94 0.86, tag:im*
 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.7, class:^(zen-alpha)$ # zen browser
-windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser|[Cc]achy-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
 windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar|org.gnome.Nautilus)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
 windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$
 windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
 windowrulev2 = opacity 0.8 0.7, class:^(Alacritty|kitty|kitty-dropterm)$ # Terminals
-windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler|code-oss)$
 windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
 windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
-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:^(VSCode|code-url-handler)$
-windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-.+)$ # JetBrains IDEs
-windowrulev2 = opacity 0.94 0.86, class:^([Dd]iscord|[Vv]esktop)$
-windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
 windowrulev2 = opacity 0.9 0.8, class:^(im.riot.Riot)$ # Element matrix client
 windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot(-gui)?|org.gnome.baobab)$
 windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
@@ -109,8 +127,6 @@ 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|io.missioncenter.MissionCenter)$
 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)$
 windowrulev2 = opacity 0.95 0.75, title:^(Picture-in-Picture)$
 
 # windowrule v2 - size
@@ -134,6 +150,10 @@ windowrulev2 = pin,title:^(Picture-in-Picture)$
 # windowrule v2 - extras
 windowrulev2 = keepaspectratio, title:^(Picture-in-Picture)$
 
+# windowrule v2 - blur and fullscreen
+windowrulev2 = noblur, tag:games*
+windowrulev2 = fullscreen, tag:games*
+
 #windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
 #windowrulev2 = opacity 0.8 0.8, pinned:1
@@ -149,4 +169,4 @@ layerrule = ignorezero, rofi
 #layerrule = ignorezero, <rofi>
 
 #layerrule = ignorezero, overview
-#layerrule = blur, overview
+#layerrule = blur, overview
\ No newline at end of file