Merge branch 'development' into weatherPy

5 files changed, 11 insertions, 83 deletions

diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
deleted file mode 100644
index efb47cb5..00000000
--- a/config/hypr/UserConfigs/Monitors.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-
-# Monitor Configuration
-# See Hyprland wiki for more details
-# https://wiki.hyprland.org/Configuring/Monitors/
-# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info.
-
-# Monitors
-monitor=,preferred,auto,1
-
-# High Refresh Rate
-monitor=,highrr,auto,1
-
-# High Resolution
-monitor=,highres,auto,1
-
-# NOTE: for laptop, kindly check notes in Laptops.conf regarding display
-# Created this inorder for the monitor display to not wake up if not intended.
-# See here: https://github.com/hyprwm/Hyprland/issues/4090
-
-# Some examples to set your own monitor
-#monitor = eDP-1, preferred, auto, 1
-#monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
-#monitor = DP-3, 1920x1080@240, auto, 1 
-#monitor = DP-1, preferred, auto, 1
-#monitor = HDMI-A-1, preferred,auto,1
-
-# QEMU-KVM, virtual box or vmware
-#monitor = Virtual-1, 1920x1080@60,auto,1
-
-# to disable a monitor
-#monitor=name,disable
-
-# Mirror samples
-#monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2
-#monitor=,preferred,auto,1,mirror,eDP-1
-#monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1
-
-# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below
-# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit.
-# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen)
-# monitor=,preferred,auto,1,bitdepth,10
-
-#monitor=eDP-1,transform,0
-#monitor=eDP-1,addreserved,10,10,10,49
-
-# workspaces - Monitor rules
-# https://wiki.hyprland.org/Configuring/Workspace-Rules/
-# SUPER E - Workspace-Rules 
-# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf
-
diff --git a/config/hypr/UserConfigs/UserDecorations.conf b/config/hypr/UserConfigs/UserDecorations.conf
index b69f26ec..0b450904 100644
--- a/config/hypr/UserConfigs/UserDecorations.conf
+++ b/config/hypr/UserConfigs/UserDecorations.conf
@@ -10,8 +10,8 @@ source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
 
 general {
   border_size = 2
-  gaps_in = 4
-  gaps_out = 6
+  gaps_in = 2
+  gaps_out = 4
   
   col.active_border = $color12 
   col.inactive_border = $color10
@@ -55,4 +55,4 @@ group {
 	groupbar {
 		col.active = $color0
   }
-}
\ No newline at end of file
+}
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 0538ee72..58fb80ac 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -44,7 +44,7 @@ bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
 bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
 
 # FEATURES / EXTRAS (UserScripts)
-bind = $mainMod SHIFT, E, exec, $UserScripts/QuickEdit.sh # Quick Edit Hyprland Settings
+bind = $mainMod SHIFT, E, exec, $UserScripts/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings
 bind = $mainMod SHIFT, M, exec, $UserScripts/RofiBeats.sh # online music using rofi
 bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to apply
 bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagick
@@ -53,7 +53,7 @@ bind = $mainMod CTRL, O, exec, hyprctl setprop active opaque toggle # disable op
 bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # search keybinds via rofi
 bind = $mainMod SHIFT, A, exec, $scriptsDir/Animations.sh #hyprland animations menu
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
-bindn = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout
+bindln = ALT_L, SHIFT_L, exec, $scriptsDir/SwitchKeyboardLayout.sh # Change keyboard layout
 bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
 # pyprland (This is not available in Debian and Ubuntu)
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 4c1e5dc6..42ab5710 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -13,6 +13,8 @@ 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|zen)$
 windowrulev2 = tag +notif, class:^(swaync-control-center|swaync-notification-window|swaync-client|class)$
+windowrulev2 = tag +KooL_Settings, title:^(KooL Hyprland Settings)$
+windowrulev2 = tag +KooL-Settings, class:^(nwg-displays|nwg-look)$
 
 # terminal tags
 windowrulev2 = tag +terminal, class:^(Alacritty|kitty|kitty-dropterm)$
@@ -67,7 +69,7 @@ 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:^(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)$
@@ -82,6 +84,7 @@ windowrulev2 = tag +viewer, class:^(eog|org.gnome.Loupe)$ # image viewer
 windowrulev2 = center, title:^(KooL Quick Cheat Sheet)$
 windowrulev2 = center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)
 windowrulev2 = center, title:^(ROG Control)$
+windowrulev2 = center, tag:KooL-Settings*
 windowrulev2 = center, title:^(Keybindings)$
 windowrulev2 = center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
 windowrulev2 = center, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
@@ -114,6 +117,7 @@ windowrulev2 = float, title:^(KooL Quick Cheat Sheet)$
 windowrulev2 = float, tag:wallpaper*
 windowrulev2 = float, tag:settings*
 windowrulev2 = float, tag:viewer*
+windowrulev2 = float, tag:KooL-Settings*
 windowrulev2 = float, class:([Zz]oom|onedriver|onedriver-launcher)$
 windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
 windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$
@@ -123,6 +127,7 @@ windowrulev2 = float, class:^([Ff]erdium)$
 windowrulev2 = float, title:^(Picture-in-Picture)$
 #windowrulev2 = float, title:^(Firefox)$
 
+
 #windowrule v2 - float popups and dialogue
 windowrulev2 = float, title:^(Authentication Required)$
 windowrulev2 = center, title:^(Authentication Required)$
diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf
deleted file mode 100644
index 350022b1..00000000
--- a/config/hypr/UserConfigs/WorkspaceRules.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# /* ---- 💫 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. Below are just examples
-# workspace = 1, monitor:eDP-1
-# workspace = 2, monitor:eDP-1
-# workspace = 3, monitor:eDP-1
-# workspace = 4, monitor:eDP-1
-# workspace = 5, monitor:DP-2
-# workspace = 6, monitor:DP-2
-# workspace = 7, monitor:DP-2
-# workspace = 8, 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