diff --git a/bin/omarchy-hyprland-monitor-scaling-cycle b/bin/omarchy-hyprland-monitor-scaling-cycle index c88a87b3..9addd89c 100755 --- a/bin/omarchy-hyprland-monitor-scaling-cycle +++ b/bin/omarchy-hyprland-monitor-scaling-cycle @@ -9,8 +9,9 @@ WIDTH=$(echo "$MONITOR_INFO" | jq -r '.width') HEIGHT=$(echo "$MONITOR_INFO" | jq -r '.height') REFRESH_RATE=$(echo "$MONITOR_INFO" | jq -r '.refreshRate') -# Cycle through scales: 1 → 1.25 → 1.6 → 2 → 3 → 4 → 1 (or reverse with --reverse) +# Cycle through monitor/GDK scale pairs: 1 → 1.25 → 1.6 → 2 → 3 → 4 → 1 (or reverse with --reverse) SCALES=(1 1.25 1.6 2 3 4) +GDK_SCALES=(1 1.25 1.75 2 3 4) # Find the index of the scale closest to the current one (Hyprland may # snap fractional scales to nearby values, so we can't match exactly) @@ -31,16 +32,22 @@ else fi NEW_SCALE=${SCALES[$NEW_IDX]} +NEW_GDK_SCALE=${GDK_SCALES[$NEW_IDX]} hyprctl eval "hl.monitor({ output = \"$ACTIVE_MONITOR\", mode = \"${WIDTH}x${HEIGHT}@${REFRESH_RATE}\", position = \"auto\", scale = $NEW_SCALE })" >/dev/null -# Persist to monitors.lua if the user has a single generic catch-all line, -# so the scale survives reboots. +# Persist to monitors.lua if the user still has Omarchy's generic catch-all +# defaults, so the scale survives reboots. MONITOR_LUA="$HOME/.config/hypr/monitors.lua" -if [[ -f $MONITOR_LUA ]] && grep -q '^hl\.monitor({ output = "", mode = "preferred", position = "auto", scale = ' "$MONITOR_LUA"; then +if [[ -f $MONITOR_LUA ]] && grep -q '^local omarchy_monitor_scale = ' "$MONITOR_LUA"; then + sed -i -E \ + -e "s|^local omarchy_monitor_scale = .*|local omarchy_monitor_scale = ${NEW_SCALE}|" \ + -e "s|^local omarchy_gdk_scale = .*|local omarchy_gdk_scale = ${NEW_GDK_SCALE}|" \ + "$MONITOR_LUA" +elif [[ -f $MONITOR_LUA ]] && grep -Eq '^hl\.monitor\(\{ output = "", mode = "preferred", position = "auto", scale = ("auto"|[0-9.]+) \}\)' "$MONITOR_LUA"; then sed -i -E \ -e "s|^(hl\.monitor\(\{ output = \"\", mode = \"preferred\", position = \"auto\", scale = )([^ ]+)( \}\))|\\1${NEW_SCALE}\\3|" \ - -e 's|^hl\.env\("GDK_SCALE", ".*"\)|hl.env("GDK_SCALE", "'"$NEW_SCALE"'")|' \ + -e 's|^hl\.env\("GDK_SCALE", ".*"\)|hl.env("GDK_SCALE", "'"$NEW_GDK_SCALE"'")|' \ "$MONITOR_LUA" fi diff --git a/config/hypr/monitors.lua b/config/hypr/monitors.lua index b51a5820..dee9fd8e 100644 --- a/config/hypr/monitors.lua +++ b/config/hypr/monitors.lua @@ -1,18 +1,23 @@ -- See https://wiki.hypr.land/Configuring/Basics/Monitors/ -- List current monitors and resolutions possible: hyprctl monitors all +local omarchy_gdk_scale = 2 +local omarchy_monitor_scale = "auto" + -- Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K. -hl.env("GDK_SCALE", "2") -hl.monitor({ output = "", mode = "preferred", position = "auto", scale = "auto" }) +-- local omarchy_gdk_scale = 2 +-- local omarchy_monitor_scale = "auto" --- Good compromise for 27" or 32" 4K monitors (but fractional!) --- hl.env("GDK_SCALE", "1.75") --- hl.monitor({ output = "", mode = "preferred", position = "auto", scale = 1.6 }) +-- Good compromise for 27" or 32" 4K monitors (but fractional!): monitor scale 1.6, GDK scale 1.75. +-- local omarchy_gdk_scale = 1.75 +-- local omarchy_monitor_scale = 1.6 --- Straight 1x setup for low-resolution displays like 1080p or 1440p. --- Or for ultrawide monitors like 34" 3440x1440 or 49" 5120x1440. --- hl.env("GDK_SCALE", "1") --- hl.monitor({ output = "", mode = "preferred", position = "auto", scale = 1 }) +-- Straight 1x setup for low-resolution displays like 1080p, 1440p, or ultrawides: both 1. +-- local omarchy_gdk_scale = 1 +-- local omarchy_monitor_scale = 1 + +hl.env("GDK_SCALE", tostring(omarchy_gdk_scale)) +hl.monitor({ output = "", mode = "preferred", position = "auto", scale = omarchy_monitor_scale }) -- Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°) -- hl.monitor({ output = "DP-2", mode = "preferred", position = "auto", scale = 1, transform = 1 })