From ea854b83e64cb91ffd67b6be100aad450622329e Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 12 Jun 2024 23:15:23 -0400 Subject: [PATCH] update: hidpi move to hyprland.conf --- .install/hidpi.sh | 5 +++- hypr/conf/hidpi.conf | 2 +- hypr/hyprland.conf | 62 ++++++++++++++++++++++---------------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.install/hidpi.sh b/.install/hidpi.sh index 8aa5546..811d512 100755 --- a/.install/hidpi.sh +++ b/.install/hidpi.sh @@ -11,7 +11,10 @@ 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\n# hidpi scale\nsource = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/conf/custom.conf + 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 echo ":: finished hidpi patch." fi diff --git a/hypr/conf/hidpi.conf b/hypr/conf/hidpi.conf index 12ac8ca..d2bda97 100644 --- a/hypr/conf/hidpi.conf +++ b/hypr/conf/hidpi.conf @@ -3,4 +3,4 @@ xwayland { } env = GDK_SCALE,2 -env = QT_SCALE_FACTOR=2 +env = QT_SCALE_FACTOR,2 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 45ae6ff..7f89b3e 100644 --- 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 \ No newline at end of file +# ----------------------------------------------------- +exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP