9 files changed, 83 insertions, 31 deletions
diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 4437c641..b9d20480 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 #environment-variables
 env = CLUTTER_BACKEND,wayland
diff --git a/config/hypr/UserConfigs/LaptopDisplay.conf b/config/hypr/UserConfigs/LaptopDisplay.conf
index d50c9119..9f766582 100644
--- a/config/hypr/UserConfigs/LaptopDisplay.conf
+++ b/config/hypr/UserConfigs/LaptopDisplay.conf
@@ -1,4 +1,4 @@
-## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
-## See notes on Laptops.conf
+# NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid.
+# See notes on Laptops.conf
 
 #monitor = eDP-1, preferred, auto, 1
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index 20a6c6f9..00d8b8c6 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more variable settings
 # These configs are mostly for laptops. This is addemdum to Keybinds.conf
@@ -30,8 +30,8 @@ bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active win
 #bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1"
 #bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
 
-#############################################################################
-### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
+
+# WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION!
 # CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper.
 # CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor
 # One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!!
@@ -44,4 +44,4 @@ bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active win
 
 # for laptop-lid action (to erase the last entry)
 #exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
-##############################################################################
+#
diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
index 3e758c0a..36781f99 100644
--- a/config/hypr/UserConfigs/Monitors.conf
+++ b/config/hypr/UserConfigs/Monitors.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
 # Monitor Configuration
 # See Hyprland wiki for more details
diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 7f2d600d..8b5ed9f8 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 #Commands & Apps to be executed at launch
 
 $scriptsDir = $HOME/.config/hypr/scripts
@@ -9,7 +9,7 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $UserScripts/WallpaperAutoChange.sh
 
 # wallpaper stuff / More wallpaper options below
-exec-once = swww query || swww init
+exec-once = swww query || swww-daemon --format xrgb
 exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes 
 
 # Startup
@@ -32,17 +32,16 @@ exec-once = wl-paste --type text --watch cliphist store
 exec-once = wl-paste --type image --watch cliphist store
 
 # Rainbow borders
-exec-once = $UserScripts/RainbowBorders.sh
+exec-once = $UserScripts/RainbowBorders.sh &
 
-# sway-idle with lock only
-exec-once = swayidle -w timeout 900 '$lock'
-# sway-idle with lock and sleep
-#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# sway idle without lock
-#exec-once = swayidle -w  timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+# Starting hypridle to start hyprlock
+exec-once = hypridle &
 
-## Here are list of features available but disabled by default
-#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+# Start pyprland daemon
+exec-once = pypr &
+
+# Here are list of features available but disabled by default
+# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index f55f0d5e..7ffd702e 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # This is where you put your own keybinds. Be Mindful to check as well ~/.config/hypr/configs/Keybinds.conf to avoid conflict
 # if you think I should replace the Pre-defined Keybinds in ~/.config/hypr/configs/Keybinds.conf , submit an issue or let me know in DC and present me a valid reason as to why, such as conflicting with global shortcuts, etc etc
 
@@ -12,12 +12,16 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $UserScripts = $HOME/.config/hypr/UserScripts
 
 # rofi App launcher
-bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
+#bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
 bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
 
 bind = $mainMod, Return, exec, $term  # Launch terminal
 bind = $mainMod, T, exec, $files
 
+# pyprland
+bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
+bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
+
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index fa2e55a9..6c801f7f 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -1,8 +1,8 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # User Settings
 # This is where you put your own settings as this will not be touched during update
 
-## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
+# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
 
 # Sourcing colors generated by pywal
 source = $HOME/.cache/wal/colors-hyprland
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index a3a77cfb..38d41222 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -1,4 +1,4 @@
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
 windowrule = float, org.kde.polkit-kde-authentication-agent-1
@@ -11,7 +11,9 @@ windowrule = float, zoom
 windowrule = float, rofi
 windowrule = float, gnome-system-monitor
 windowrule = float, yad
-
+windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
+windowrule = float, ^(evince)$ # document viewer
+windowrule = float, ^(file-roller)$ # archive manager
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
@@ -19,9 +21,10 @@ windowrule = float, yad
 windowrule = center,^(pavucontrol) 
 
 # windowrule v2
-windowrulev2 = workspace 1, class:^(thunderbird)$
-windowrulev2 = workspace 2, class:^(firefox)$
-windowrulev2 = workspace 2, class:^(Firefox-esr)$
+windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
+windowrulev2 = workspace 2, class:^([Ff]irefox)$
+windowrulev2 = workspace 2, class:^(org.mozilla.firefox)$
+windowrulev2 = workspace 2, class:^([Ff]irefox-esr)$
 windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
 windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
@@ -32,15 +35,32 @@ windowrulev2 = workspace 7 silent, class:^(discord)$
 windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
+# windowrule v2 - float
+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)
+
 #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.7, class:^([Ff]irefox)$
+windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$
+windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-stable)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-beta)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-beta)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-unstable)$
+windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 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:^(deluge)$
+windowrulev2 = opacity 0.9 0.8, class:^(Alacritty)$
 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)$
@@ -48,6 +68,15 @@ 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)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
+windowrulev2 = opacity 0.9 0.8, class:^(code-url-handler)$
+windowrulev2 = opacity 0.9 0.8, class:^(VSCode)$
+windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio
+windowrulev2 = opacity 0.94 0.86, class:^(discord)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$
+windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
+windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
+windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 
 
 #layerrule = unset,class:^([Rr]ofi)$
@@ -69,4 +98,4 @@ windowrulev2=float, title:^(Picture-in-Picture)$
 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
+#windowrulev2=move 72% 7%,title:^(Firefox)$ 
diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf
new file mode 100644
index 00000000..8e98244a
--- /dev/null
+++ b/config/hypr/UserConfigs/WorkspaceRules.conf
@@ -0,0 +1,20 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+# You can set workspace rules to achieve workspace-specific behaviors. 
+# For instance, you can define a workspace where all windows are drawn without borders or gaps.
+
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+
+# Assigning workspace to a certain monitor
+# workspace = 1, monitor:eDP-1
+# workspace = 2, monitor:DP-2
+
+
+# example rules (from wiki)
+# workspace = 3, rounding:false, decorate:false
+# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1
+# workspace = 8,bordersize:8
+# workspace = name:Hello, monitor:DP-1, default:true
+# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
+# workspace = 5, on-created-empty:[float] firefox
+# workspace = special:scratchpad, on-created-empty:foot
+\ No newline at end of file