updated main to resolve conflicts

2 files changed, 78 insertions, 5 deletions

diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/configs/WindowRules.conf
new file mode 100644
index 00000000..a3a77cfb
--- /dev/null
+++ b/config/hypr/configs/WindowRules.conf
@@ -0,0 +1,72 @@
+## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+
+windowrule = float, org.kde.polkit-kde-authentication-agent-1
+windowrule = float, nm-connection-editor|blueman-manager
+windowrule = float, pavucontrol
+windowrule = float, nwg-look|qt5ct|mpv
+windowrule = float, onedriver|onedriver-launcher
+windowrule = float, eog
+windowrule = float, zoom
+windowrule = float, rofi
+windowrule = float, gnome-system-monitor
+windowrule = float, yad
+
+#windowrule = noblur,gamescope
+#windowrule = fullscreen,gamescope
+#windowrule = workspace 6 silent,^(gamescope)$
+
+windowrule = center,^(pavucontrol) 
+
+# windowrule v2
+windowrulev2 = workspace 1, class:^(thunderbird)$
+windowrulev2 = workspace 2, class:^(firefox)$
+windowrulev2 = workspace 2, class:^(Firefox-esr)$
+windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
+windowrulev2 = workspace 3, class:^([Tt]hunar)$
+windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
+windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
+windowrulev2 = workspace 5 silent, class:^(lutris)$
+windowrulev2 = workspace 6, class:^(virt-manager)$
+windowrulev2 = workspace 7 silent, class:^(discord)$
+windowrulev2 = workspace 7 silent, class:^(WebCord)$
+windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
+
+#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.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:^(kitty)$
+windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
+windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$
+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)$
+
+
+#layerrule = unset,class:^([Rr]ofi)$
+#layerrule = blur,class:^([Rr]ofi)$
+#layerrule = ignorezero, <rofi>
+
+#windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
+#windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
+#windowrulev2 = opacity 0.8 0.8, pinned:1
+
+# Picture-in-a-Picture (PIP) rules: Oddly, some need re-duplication.  This is because the window for
+# PIP changes after on first launch, and will not inherant the rules...
+windowrulev2=opacity 0.95 0.75,title:^(Picture-in-Picture)$ # for opacity: [focus num] [bg num]
+# Interestingly, the opacity rule above doesn't need the reduplication?
+windowrulev2=pin,title:^(Picture-in-Picture)$ 
+#windowrulev2=pin,title:^(Firefox)$ 
+windowrulev2=float, title:^(Picture-in-Picture)$
+#windowrulev2=float, title:^(Firefox)$
+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
diff --git a/config/hypr/scripts/WallpaperSelect.sh b/config/hypr/scripts/WallpaperSelect.sh
index cde48225..691b8fd2 100755
--- a/config/hypr/scripts/WallpaperSelect.sh
+++ b/config/hypr/scripts/WallpaperSelect.sh
@@ -6,11 +6,11 @@ SCRIPTSDIR="$HOME/.config/hypr/scripts"
 DIR="$HOME/Pictures/wallpapers"
 
 # Transition config
-FPS=60
-TYPE="any"
+FPS=30
+TYPE="wipe"
 DURATION=1
-BEZIER="0,.53,1,.48"
-SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
+BEZIER=".43,1.19,1,.4"
+SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
 # Check if swaybg is running
 if pidof swaybg > /dev/null; then
@@ -80,6 +80,7 @@ fi
 
 main
 
+sleep 0.5
 ${SCRIPTSDIR}/PywalSwww.sh
-sleep 1
+sleep 0.2
 ${SCRIPTSDIR}/Refresh.sh