Merge pull request #512 from JaKooLit/main

Main to Development

5 files changed, 20 insertions, 19 deletions

diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
index f4b313d7..efb47cb5 100644
--- a/config/hypr/UserConfigs/Monitors.conf
+++ b/config/hypr/UserConfigs/Monitors.conf
@@ -8,11 +8,17 @@
 # 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
+# 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 
@@ -22,12 +28,6 @@ monitor=,preferred,auto,1
 # QEMU-KVM, virtual box or vmware
 #monitor = Virtual-1, 1920x1080@60,auto,1
 
-# High Refresh Rate
-#monitor=,highrr,auto,1
-
-# High Resolution
-#monitor=,highres,auto,1
-
 # to disable a monitor
 #monitor=name,disable
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index ae0ab4b2..dfca157d 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -94,12 +94,11 @@ misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
   vfr = true
-  #vrr = 0
+  vrr = 2
   mouse_move_enables_dpms = true
   enable_swallow = true
   swallow_regex = ^(kitty)$
   focus_on_activate = false
-  #no_direct_scanout = true #for fullscreen games - deprecated
   initial_workspace_tracking = 0
   middle_click_paste = false
 }
@@ -128,8 +127,9 @@ render {
 }
 
 cursor {
-  no_hardware_cursors = false
+  sync_gsettings_theme = true
+  no_hardware_cursors = 2
   enable_hyprcursor = true
-  warp_on_change_workspace = true
+  warp_on_change_workspace = 2
   no_warps = true 
-}
+}
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index b3209475..262401be 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -27,6 +27,7 @@ windowrulev2 = idleinhibit fullscreen, fullscreen:1
 
 # windowrule v2 move to workspace
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
+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)?)$
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index fb9cf574..4780de7e 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -11,7 +11,7 @@
 scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
 waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css"
-kvantum_theme="Catppuccin-Mocha"
+kvantum_theme="catppuccin-mocha-blue"
 color_scheme="prefer-dark"
 gtk_theme="Andromeda-dark"
 icon_theme="Flat-Remix-Blue-Dark"
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 2e2d614e..83fcb3b8 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -127,13 +127,13 @@ $swww "${next_wallpaper}" $effect
 
 # Set Kvantum Manager theme & QT5/QT6 settings
 if [ "$next_mode" = "Dark" ]; then
-    kvantum_theme="Catppuccin-Mocha"
-    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Mocha.conf"
-    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Mocha.conf"
+    kvantum_theme="catppuccin-mocha-blue"
+    #qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Mocha.conf"
+    #qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Mocha.conf"
 else
-    kvantum_theme="Catppuccin-Latte"
-    qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Latte.conf"
-    qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Latte.conf"
+    kvantum_theme="catppuccin-latte-blue"
+    #qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Catppuccin-Latte.conf"
+    #qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Catppuccin-Latte.conf"
 fi
 
 sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf"