From a057918d247ef64ad2439970560025852673e37c Mon Sep 17 00:00:00 2001
From: moonleay <contact@moonleay.net>
Date: Sat, 15 Jun 2024 00:31:23 +0200
Subject: [PATCH] fix: fixed mouse scaling issue

---
 gtk-3.0/bookmarks         |  3 +++
 hypr/env_vars.conf        | 23 ++++++++++++++---------
 hypr/hyprland.conf        |  4 ++++
 hypr/hyprpaper.conf       |  2 +-
 hypr/monitors.conf        |  4 ++--
 hypr/windowrules.conf     |  2 ++
 waybar/modules/spotify.sh |  2 +-
 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/gtk-3.0/bookmarks b/gtk-3.0/bookmarks
index d69f41b..a808d0d 100644
--- a/gtk-3.0/bookmarks
+++ b/gtk-3.0/bookmarks
@@ -1,6 +1,9 @@
+file:///home/moonleay/src
 file:///home/moonleay/Downloads
 file:///home/moonleay/Documents
 file:///home/moonleay/Pictures
 file:///home/moonleay/Pictures/Screenshots
 file:///home/moonleay/Music
 file:///home/moonleay/Videos
+file:///home/moonleay/.gradle
+file:///home/moonleay/.ssh
diff --git a/hypr/env_vars.conf b/hypr/env_vars.conf
index 2e16b7d..93db523 100644
--- a/hypr/env_vars.conf
+++ b/hypr/env_vars.conf
@@ -2,16 +2,21 @@
 env = MOZ_ENABLE_WAYLAND,1
 env = MOZ_DISABLE_RDD_SANDBOX,1
 env = WLR_DRM_NO_ATOMIC,1
-env = GDK_BACKEND=wayland,x11
-env = QT_QPA_PLATFORM="wayland;xcb"
-env = SDL_VIDEODRIVER=wayland
-env = CLUTTER_BACKEND=wayland
-env = XDG_CURRENT_DESKTOP=Hyprland
-env = XDG_SESSION_TYPE=wayland
-env = XDG_SESSION_DESKTOP=Hyprland
+env = GDK_BACKEND,wayland,x11
+env = QT_QPA_PLATFORM,wayland;xcb
+env = SDL_VIDEODRIVER,wayland
+env = CLUTTER_BACKEND,wayland
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_QPA_PLATFORMTHEME,qt5ct
 
 env = HYPRCURSOR_THEME,adwaita
 env = HYPRCURSOR_SIZE,24
-env = XCURSOR_THEME=adwaita
-env = XCURSOR_SIZE=24
+env = XCURSOR_THEME,adwaita
+env = XCURSOR_SIZE,24
 # env = ENABLE_DEVICE_CHOOSER_LAYER=1 VULKAN_DEVICE_INDEX=0
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index c022d0b..02b8f6a 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -23,5 +23,9 @@ misc {
     vfr = true
 }
 
+debug {
+    disable_logs = false
+}
+
 # Per device configs
 # <none>
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 525d714..caf0b7f 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -7,7 +7,7 @@ preload = ~/Pictures/Wallpaper/somerndm.jpg
 #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used
 wallpaper = eDP-2,~/Pictures/Wallpaper/cityx4.png
 wallpaper = eDP-1,~/Pictures/Wallpaper/somerndm.jpg
-wallpaper = DP-1,~/Pictures/Wallpaper/somerndm.jpg
+wallpaper = DP-2,~/Pictures/Wallpaper/somerndm.jpg
 wallpaper = HDMI-A-1,~/Pictures/Wallpaper/cityx4.png
 #if more than one monitor in use, can load a 2nd image
 # .. more monitors
diff --git a/hypr/monitors.conf b/hypr/monitors.conf
index bab7efd..4a21c59 100644
--- a/hypr/monitors.conf
+++ b/hypr/monitors.conf
@@ -1,7 +1,7 @@
 # Monitors
 # monitor=,preferred,auto,auto
 # monitor=eDP-2,preferred,0x0,2
-monitor=eDP-1,preferred,0x0,1.6
-# monitor=DP-1,3840x2160@120,1280x0,1.2
+monitor=eDP-1,2560x1600@160,0x0,1.6 # 1.6
+monitor=DP-2,3840x2160@120,1600x0,1.25 # 1.2
 # monitor=HDMI-A-1,preferred,4480x0,1
 # monitor=HDMI-A-1,3440x1440@100,1280x0,1
diff --git a/hypr/windowrules.conf b/hypr/windowrules.conf
index d263a00..bf649ca 100644
--- a/hypr/windowrules.conf
+++ b/hypr/windowrules.conf
@@ -23,3 +23,5 @@ windowrulev2 = stayfocused,class:^(jetbrains-.*)$,title:^( )$,floating:1
 windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^( )$,floating:1
 #! Disable window flicker when autocomplete or tooltips appear
 windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(win.*)$,floating:1
+
+# windowrulev2 = suppressevent maximize, class:.*
diff --git a/waybar/modules/spotify.sh b/waybar/modules/spotify.sh
index 9d05c8b..f62e817 100755
--- a/waybar/modules/spotify.sh
+++ b/waybar/modules/spotify.sh
@@ -18,7 +18,7 @@ fi
 classa=$(playerctl metadata --player=spotify --format '{{lc(status)}}')
 
 if [[ $classa == "playing" ]]; then
-  icon=""  
+  icon=" "
   info=$(playerctl metadata --player=spotify --format '{{artist}} - {{title}}')
   if [[ ${#info} > 40 ]]; then
     info=$(echo $info | cut -c1-40)"..."