fix: rm cursor size in hidpi.sh

fix: set cursor size to 32, so x and way looks same
fix: use QT_AUTO_SCREEN_SCALE_FACTOR
2024-08-27 16:49:29 -04:00 · 2024-08-27 16:48:04 -04:00 · 2024-08-14 19:43:48 -04:00 · 2024-06-29 18:20:38 -04:00 · 2024-06-13 21:27:55 -04:00 · 2024-06-12 23:26:06 -04:00
8 changed files with 67 additions and 34 deletions
--- a/.install/hidpi.sh
+++ b/.install/hidpi.sh
@@ -0,0 +1,21 @@
+
+# ------------------------------------------------------
+# hidpi support
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "hidpi"
+echo -e "${NONE}"
+
+hidpiconfirm="Do you want 2x hidpi scale?"
+if gum confirm "$hidpiconfirm"; then
+    sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml
+    sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi
+    echo -e '\n# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# HiDPI Scaling' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e 'source = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
+    #sed -i -E 's/24/32/' ~/dotfiles-versions/$version/hypr/conf/cursor.conf
+    echo ":: finished hidpi patch."
+fi
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -1,5 +1,5 @@
 [font]
-size = 12.0
+size = 16.0

 [font.normal]
 family = "FiraCode Nerd Font"
--- a/hypr/conf/cursor.conf
+++ b/hypr/conf/cursor.conf
@@ -1 +1 @@
-exec-once = hyprctl setcursor Bibata-Modern-Ice 24
+exec-once = hyprctl setcursor Bibata-Modern-Ice 32
--- a/hypr/conf/environments/default.conf
+++ b/hypr/conf/environments/default.conf
@@ -9,4 +9,3 @@ env = QT_QPA_PLATFORM,wayland
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1
--- a/hypr/conf/hidpi.conf
+++ b/hypr/conf/hidpi.conf
@@ -0,0 +1,6 @@
+xwayland {
+  force_zero_scaling = true
+}
+
+env = GDK_SCALE,2
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
--- a/hypr/conf/monitors/4k.conf
+++ b/hypr/conf/monitors/4k.conf
@@ -0,0 +1,6 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=,preferred,auto,2
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,48 +1,48 @@
-#  _   _                  _                 _  
-# | | | |_   _ _ __  _ __| | __ _ _ __   __| | 
-# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` | 
-# |  _  | |_| | |_) | |  | | (_| | | | | (_| | 
-# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_| 
-#        |___/|_|                              
-#  
-# ----------------------------------------------------- 
+#  _   _                  _                 _
+# | | | |_   _ _ __  _ __| | __ _ _ __   __| |
+# | |_| | | | | '_ \| '__| |/ _` | '_ \ / _` |
+# |  _  | |_| | |_) | |  | | (_| | | | | (_| |
+# |_| |_|\__, | .__/|_|  |_|\__,_|_| |_|\__,_|
+#        |___/|_|
+#
+# -----------------------------------------------------
 # IMPORTANT: Don't overwrite ML4W configuration.
 # Create your own custom configuration variation instead.
 # https://gitlab.com/stephan-raabe/dotfiles#hyprland-configuration-variations

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Monitor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/monitor.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Autostart
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/autostart.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Cursor
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/cursor.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/environment.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Keyboard
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/keyboard.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load pywal color file
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/.cache/wal/colors-hyprland.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Load configuration files
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/window.conf
 source = ~/dotfiles/hypr/conf/decoration.conf
 source = ~/dotfiles/hypr/conf/layout.conf
@@ -50,22 +50,22 @@ source = ~/dotfiles/hypr/conf/misc.conf
 source = ~/dotfiles/hypr/conf/keybinding.conf
 source = ~/dotfiles/hypr/conf/windowrule.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Animation
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/animation.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Custom
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/custom.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # ML4W Configuration
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 source = ~/dotfiles/hypr/conf/ml4w.conf

-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Environment for xdg-desktop-portal-hyprland
-# ----------------------------------------------------- 
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+# -----------------------------------------------------
+exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
--- a/install.sh
+++ b/install.sh
@@ -61,6 +61,7 @@ if [[ $profile == *"Qtile"* ]]; then
    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
+source .install/hidpi.sh
 source .install/displaymanager.sh
 source .install/issue.sh
 source .install/restore.sh
Author	SHA1	Message	Date
Yingjie Wang	4b9e7c6175	fix: rm cursor size in hidpi.sh	2024-08-27 16:49:29 -04:00
Yingjie Wang	eb2d78da76	fix: set cursor size to 32, so x and way looks same	2024-08-27 16:48:04 -04:00
Yingjie Wang	186fee59c8	fix: use QT_AUTO_SCREEN_SCALE_FACTOR	2024-08-14 19:43:48 -04:00
Yingjie Wang	f631af1696	update: rm GTK_SCALE_FACTOR in default	2024-06-29 18:20:38 -04:00
Yingjie Wang	13750bb854	Merge branch 'upstream-main' into upstream-hidpi	2024-06-13 21:27:55 -04:00
Yingjie Wang	fa96759ddf	update: change hyprcursor size to 32 if hidpi	2024-06-12 23:26:06 -04:00
Yingjie Wang	ea854b83e6	update: hidpi move to hyprland.conf	2024-06-12 23:15:23 -04:00
Yingjie Wang	36764c77b3	Merge branch 'upstream-main' into upstream-hidpi	2024-06-05 05:51:38 -04:00
Yingjie Wang	8828e93f78	update: add an empty line in custum.conf	2024-05-26 01:26:57 -04:00
Yingjie Wang	c99a2809ce	fix: hidpi.sh	2024-05-18 16:28:58 -04:00
Yingjie Wang	08096e83ff	update: font size=16 for alacritty	2024-05-17 02:09:53 -04:00
Yingjie Wang	a0f43ada10	fix: patch in ~/dotfiles-versions rather than in repository	2024-05-17 01:46:29 -04:00
Yingjie Wang	b4a5e4d99c	Merge branch 'upstream-main' into upstream-hidpi	2024-05-05 16:34:49 -04:00
Yingjie Wang	45214117ef	Merge remote-tracking branch 'upstream/main' into upstream-hidpi	2024-04-03 14:22:34 -04:00
Yingjie Wang	0d4b85956e	fix: sed need -E	2024-04-01 15:42:06 -04:00
Yingjie Wang	8565146242	update: change the non-hidpi default font size in alacritty	2024-04-01 15:00:34 -04:00
Yingjie Wang	d2a368d166	fix hidpi.sh: echo -e	2024-03-28 20:46:48 -04:00
Yingjie Wang	c6678dcc96	update hidpi.sh: add finish output	2024-03-28 20:46:48 -04:00
Yingjie Wang	b6156e3233	fix hidpi.sh	2024-03-28 20:46:48 -04:00
Yingjie Wang	0da2e83f29	fix hidpi.sh: -i instead of -E	2024-03-28 20:46:48 -04:00
Yingjie Wang	9f8b285ba3	update hidpi.sh: run always	2024-03-28 20:46:48 -04:00
Yingjie Wang	671a47f09e	fix bug: missing fi	2024-03-28 20:46:48 -04:00
Yingjie Wang	943cb53c93	add hidpi in install.sh	2024-03-28 01:45:39 -04:00
Yingjie Wang	c3bfe46e79	add basic hidpi	2024-03-27 23:17:46 -04:00