From 8d3efd746d9d9ab7e0d529aed2410fca305611a3 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Tue, 30 May 2023 16:46:01 +0200 Subject: [PATCH] Enable per-device configuration for some settings where necessary --- arch-config/.Xresources | 2 +- arch-config/.config/polybar/i3config.ini | 2 ++ arch-config/.xinitrc | 1 + .../per-device/lupusregina/10-monitor.conf | 4 ++++ .../per-device/lupusregina/20-amdgpu.conf | 6 ++++++ arch-config/per-device/lupusregina/README.md | 7 +++++++ .../lupusregina/polybar-dpi-override.ini | 1 + .../lupusregina/xresources-dpi-override | 1 + arch-config/scripts/arch-config.sh | 17 +++++++++++++++++ 9 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 arch-config/per-device/lupusregina/10-monitor.conf create mode 100644 arch-config/per-device/lupusregina/20-amdgpu.conf create mode 100644 arch-config/per-device/lupusregina/README.md create mode 100644 arch-config/per-device/lupusregina/polybar-dpi-override.ini create mode 100644 arch-config/per-device/lupusregina/xresources-dpi-override diff --git a/arch-config/.Xresources b/arch-config/.Xresources index e04c8f71..2a59c685 100755 --- a/arch-config/.Xresources +++ b/arch-config/.Xresources @@ -2,7 +2,7 @@ ! https://terminal.sexy ! ------------------------------------------------------------------------------ - +!per-device dpi insert !Xcursor.theme: Breeze_Snow Xcursor.theme: capitaine-cursors-light diff --git a/arch-config/.config/polybar/i3config.ini b/arch-config/.config/polybar/i3config.ini index 1a2106bf..0aacd502 100755 --- a/arch-config/.config/polybar/i3config.ini +++ b/arch-config/.config/polybar/i3config.ini @@ -46,6 +46,8 @@ compositing-border = over [bar/mainbar-i3] ;https://github.com/jaagr/polybar/wiki/Configuration +;per-device dpi insert + monitor = ${env:MONITOR} ;monitor-fallback = HDMI1 monitor-strict = false diff --git a/arch-config/.xinitrc b/arch-config/.xinitrc index 25d24352..3d9e97e6 100755 --- a/arch-config/.xinitrc +++ b/arch-config/.xinitrc @@ -13,4 +13,5 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi +xrdb -merge "$HOME/.Xresources" exec i3 -c "$HOME/.config/i3/config" diff --git a/arch-config/per-device/lupusregina/10-monitor.conf b/arch-config/per-device/lupusregina/10-monitor.conf new file mode 100644 index 00000000..305b99f5 --- /dev/null +++ b/arch-config/per-device/lupusregina/10-monitor.conf @@ -0,0 +1,4 @@ +Section "Monitor" + Identifier "DisplayPort-1" + DisplaySize 598 336 # In millimeters +EndSection diff --git a/arch-config/per-device/lupusregina/20-amdgpu.conf b/arch-config/per-device/lupusregina/20-amdgpu.conf new file mode 100644 index 00000000..f1a48070 --- /dev/null +++ b/arch-config/per-device/lupusregina/20-amdgpu.conf @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "AMD" + MatchDriver "amdgpu" + Driver "amdgpu" + Option "VariableRefresh" "true" +EndSection diff --git a/arch-config/per-device/lupusregina/README.md b/arch-config/per-device/lupusregina/README.md new file mode 100644 index 00000000..c55fa031 --- /dev/null +++ b/arch-config/per-device/lupusregina/README.md @@ -0,0 +1,7 @@ +This host requires additional considerations, as it is using a 1440p display. + +The following parts are modified: + +- Polybar (.config/polybar/i3config.ini) +- Xresources (.Xresources) +- X11 (/etc/X11/xorg.conf.d/ _new files_) diff --git a/arch-config/per-device/lupusregina/polybar-dpi-override.ini b/arch-config/per-device/lupusregina/polybar-dpi-override.ini new file mode 100644 index 00000000..c76b5dce --- /dev/null +++ b/arch-config/per-device/lupusregina/polybar-dpi-override.ini @@ -0,0 +1 @@ +dpi = 109 diff --git a/arch-config/per-device/lupusregina/xresources-dpi-override b/arch-config/per-device/lupusregina/xresources-dpi-override new file mode 100644 index 00000000..7ea8b514 --- /dev/null +++ b/arch-config/per-device/lupusregina/xresources-dpi-override @@ -0,0 +1 @@ +Xft.dpi: 109 diff --git a/arch-config/scripts/arch-config.sh b/arch-config/scripts/arch-config.sh index 39b8258c..337d6dbe 100755 --- a/arch-config/scripts/arch-config.sh +++ b/arch-config/scripts/arch-config.sh @@ -290,6 +290,23 @@ sudo cp -r ~/configs/arch-config/usr / # copy xresources cp ~/configs/arch-config/.Xresources ~/ +############################## +##### Per Device Settings #### +############################## + +# lupusregina +if [ "$(hostname)" == "lupusregina" ]; then + echo "Applying overrides for $(hostname)" + # polybar dpi + polybardpi="$(cat ~/configs/arch-config/per-device/lupusregina/polybar-dpi-override.ini)" + awk -v polybardpi="${polybardpi}" '/;per-device dpi insert/{print;print "polybardpi";next}1' ~/.config/polybar/i3config.ini + # xresources dpi + xftdpi="$(cat ~/configs/arch-config/per-device/lupusregina/xresources-dpi-override)" + awk -v xftdpi="${xftdpi}" '/!per-device dpi insert/{print;print "xftdpi";next}1' ~/.Xresources + sudo cp ~/configs/arch-config/per-device/lupusregina/10-monitor.conf /etc/X11/xorg.conf.d/ + sudo cp ~/configs/arch-config/per-device/lupusregina/20-amdgpu.conf /etc/X11/xorg.conf.d/ +fi + #################### ###### Theme ###### ####################