Merge pull request #538 from JaKooLit/main

Main to development

7 files changed, 82 insertions, 66 deletions

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 08827e91..e41a7ecb 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -23,7 +23,7 @@ exec-once = $scriptsDir/Polkit.sh
 exec-once = waybar &
 exec-once = nm-applet --indicator &
 exec-once = swaync &
-exec-once = ags &
+#exec-once = ags &
 #exec-once = blueman-applet & 
 #exec-once = rog-control-center &
 
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 378e1048..35d549f6 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -6,11 +6,15 @@
 # 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:^(chrome-.+-Default)$ # Chrome PWAs
 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)$
 
+# terminal tags
+windowrulev2 = tag +terminal, class:^(Alacritty|kitty|kitty-dropterm)$
+
 # email tags
 windowrulev2 = tag +email, class:^([Tt]hunderbird|org.gnome.Evolution)$
 windowrulev2 = tag +email, class:^(eu.betterbird.Betterbird)$
@@ -39,10 +43,38 @@ windowrulev2 = tag +gamestore, class:^([Ss]team)$
 windowrulev2 = tag +gamestore, title:^([Ll]utris)$
 windowrulev2 = tag +gamestore, class:^(com.heroicgameslauncher.hgl)$
 
+# file-manager tags
+windowrulev2 = tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
+windowrulev2 = tag +file-manager, class:^(app.drey.Warp)$
+
+# wallpaper tags
+windowrulev2 = tag +wallpaper title:^([Ww]aytrogen)$
+windowrulev2 = tag +wallpaper, class:^([Ww]aytrogen)$
+
 # multimedia tags
 windowrulev2 = tag +multimedia, class:^([Aa]udacious)$
 
-# windowrule v2 - position
+
+# settings tags
+windowrulev2 = tag +settings, title:^(ROG Control)$
+windowrulev2 = tag +settings, class:^(wihotspot(-gui)?)$ # wifi hotspot
+windowrulev2 = tag +settings, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analyzer
+windowrulev2 = tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$
+windowrulev2 = tag +settings, title:(Kvantum Manager)
+windowrulev2 = tag +settings, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
+windowrulev2 = tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$
+windowrulev2 = tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
+windowrulev2 = tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
+windowrulev2 = tag +settings, class:(xdg-desktop-portal-gtk)
+windowrulev2 = tag +settings, class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = tag +settings, class:^([Rr]ofi)$
+
+# viewer tags
+windowrulev2 = tag +viewer, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
+windowrulev2 = tag +viewer, class:^(evince)$ # document viewer 
+windowrulev2 = tag +viewer, class:^(eog|org.gnome.Loupe)$ # image viewer
+
+# POSITION
 # windowrulev2 = center,floating:1 # warning, it cause even the menu to float and center.
 windowrulev2 = center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)
 windowrulev2 = center, title:^(ROG Control)$
@@ -73,84 +105,60 @@ windowrulev2 = workspace 6 silent, class:^(virt-manager)$
 windowrulev2 = workspace 6 silent, class:^(.virt-manager-wrapped)$
 windowrulev2 = workspace 9 silent, tag:multimedia*
 
-# windowrule v2 - float
+# FLOAT
+windowrulev2 = float, tag:wallpaper*
+windowrulev2 = float, tag:settings*
+windowrulev2 = float, tag:viewer*
 windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$
-windowrulev2 = float, class:(xdg-desktop-portal-gtk)
 windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
-windowrulev2 = float, class:^([Rr]ofi)$
-windowrulev2 = float, class:^(eog|org.gnome.Loupe)$ # image viewer
-windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
-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:^(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:^([Qq]alculate-gtk)$
 #windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = float, class:^([Ff]erdium)$
 windowrulev2 = float, title:^(Picture-in-Picture)$
-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
+# OPACITY
 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.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.94 0.86, tag:multimedia*
+windowrulev2 = opacity 0.9 0.8, tag:file-manager*
+windowrulev2 = opacity 0.8 0.7, tag:terminal*
+windowrulev2 = opacity 0.8 0.7, tag:settings*
+windowrulev2 = opacity 0.82 0.75, tag:viewer*
+windowrulev2 = opacity 0.9 0.7, tag:wallpaper*
 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.8, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
-windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
-windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
 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
-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.95 0.75, title:^(Picture-in-Picture)$
 
-# windowrule v2 - size
-windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$
-windowrulev2 = size 70% 70%, class:^(xdg-desktop-portal-gtk)$
-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)$
+
+# SIZE
+windowrulev2 = size 70% 70%, tag:wallpaper*
+windowrulev2 = size 70% 70%, tag:settings*
 windowrulev2 = size 60% 70%, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = size 60% 70%, class:^([Ff]erdium)$
-windowrulev2 = size 60% 70%, title:^(ROG Control)$
+
 #windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$   
 #windowrulev2 = size 25% 25%, title:^(Firefox)$ 
-windowrulev2 = size 60% 70%, title:^(hyprgui)$
 
-# windowrule v2 - pinning
-windowrulev2 = pin,title:^(Picture-in-Picture)$
+# PINNING
+windowrulev2 = pin, title:^(Picture-in-Picture)$
 #windowrulev2 = pin,title:^(Firefox)$ 
 
 # windowrule v2 - extras
 windowrulev2 = keepaspectratio, title:^(Picture-in-Picture)$
 
-# windowrule v2 - blur and fullscreen
+# BLUR & FULLSCREEN
 windowrulev2 = noblur, tag:games*
 windowrulev2 = fullscreen, tag:games*
 
@@ -158,7 +166,6 @@ windowrulev2 = fullscreen, tag:games*
 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
 #windowrulev2 = opacity 0.8 0.8, pinned:1
 
-
 # LAYER RULES
 layerrule = blur, rofi
 layerrule = ignorezero, rofi
diff --git a/config/hypr/animations/default - v2.conf b/config/hypr/animations/default - v2.conf
index 37fbe125..dfbbed7f 100644
--- a/config/hypr/animations/default - v2.conf
+++ b/config/hypr/animations/default - v2.conf
@@ -20,7 +20,7 @@ animations {
   animation = windowsOut, 1, 5, winOut, popin
   animation = windowsMove, 1, 5, wind, slide
   animation = border, 1, 10, linear
-#  animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors
+  animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors
   animation = fade, 1, 5, overshot
   animation = workspaces, 1, 5, wind
   animation = windows, 1, 5, bounce, popin
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 4d2d6aaa..474a37a7 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -36,7 +36,16 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     gsettings set org.gnome.desktop.interface icon-theme $icon_theme > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-theme $cursor_theme > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-size 24 > /dev/null 2>&1 &
-    
+
+     # NIXOS initiate GTK dark mode and apply icon and cursor theme
+	if [ -n "$(grep -i nixos < /etc/os-release)" ]; then
+      gsettings set org.gnome.desktop.interface color-scheme "'$color_scheme'" > /dev/null 2>&1 &
+      dconf write /org/gnome/desktop/interface/gtk-theme "'$gtk_theme'" > /dev/null 2>&1 &
+      dconf write /org/gnome/desktop/interface/icon-theme "'$icon_theme'" > /dev/null 2>&1 &
+      dconf write /org/gnome/desktop/interface/cursor-theme "'$cursor_theme'" > /dev/null 2>&1 &
+      dconf write /org/gnome/desktop/interface/cursor-size "24" > /dev/null 2>&1 &
+	fi
+       
     # initiate kvantum theme
     kvantummanager --set "$kvantum_theme" > /dev/null 2>&1 &
 
diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current
index 4a3515da..2c5e839e 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_current
+++ b/config/hypr/wallpaper_effects/.wallpaper_current
diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified
index b42159e3..f546bd56 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_modified
+++ b/config/hypr/wallpaper_effects/.wallpaper_modified
diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf
index 52ced087..92bcfc7c 100644
--- a/config/hypr/wallust/wallust-hyprland.conf
+++ b/config/hypr/wallust/wallust-hyprland.conf
@@ -1,21 +1,21 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  
 # /* wallust template - colors-hyprland */ 
 
-$background = rgb(212022)
-$foreground = rgb(FAF0E8)
-$color0 = rgb(474649)
-$color1 = rgb(1A171F)
-$color2 = rgb(143551)
-$color3 = rgb(99352B)
-$color4 = rgb(2B5C98)
-$color5 = rgb(0DB0B6)
-$color6 = rgb(B4A08E)
-$color7 = rgb(EFE2D6)
-$color8 = rgb(A79E95)
-$color9 = rgb(231F29)
-$color10 = rgb(1B466C)
-$color11 = rgb(CC463A)
-$color12 = rgb(3A7BCA)
-$color13 = rgb(12EBF3)
-$color14 = rgb(F0D5BD)
-$color15 = rgb(EFE2D6)
+$background = rgb(1E1516)
+$foreground = rgb(ACF2F1)
+$color0 = rgb(463C3D)
+$color1 = rgb(181916)
+$color2 = rgb(073122)
+$color3 = rgb(073122)
+$color4 = rgb(0E455E)
+$color5 = rgb(0D942F)
+$color6 = rgb(0DA4A1)
+$color7 = rgb(80E4E2)
+$color8 = rgb(59A09E)
+$color9 = rgb(20211D)
+$color10 = rgb(09422D)
+$color11 = rgb(09422D)
+$color12 = rgb(135C7D)
+$color13 = rgb(11C63F)
+$color14 = rgb(11DAD6)
+$color15 = rgb(80E4E2)