From 0cd92ab9d5bcc9834110c20c2abe409458ad1213 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Fri, 30 Dec 2022 02:52:05 -0500 Subject: [PATCH] Moved xinputrc to xinitrc --- dot_xinitrc => dot_xinitrc.tmpl | 26 ++++++++------------------ dot_xinputrc | 1 - 2 files changed, 8 insertions(+), 19 deletions(-) rename dot_xinitrc => dot_xinitrc.tmpl (71%) delete mode 100644 dot_xinputrc diff --git a/dot_xinitrc b/dot_xinitrc.tmpl similarity index 71% rename from dot_xinitrc rename to dot_xinitrc.tmpl index 610a1c4..ed4d436 100644 --- a/dot_xinitrc +++ b/dot_xinitrc.tmpl @@ -2,21 +2,14 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/Xresources +sysmodmap=/etc/X11/xinit/Xmodmap + # merge in defaults and keymaps if [ -f $sysresources ]; then - - - - - - - xrdb -merge $sysresources - fi if [ -f $sysmodmap ]; then @@ -24,15 +17,7 @@ if [ -f $sysmodmap ]; then fi if [ -f "$userresources" ]; then - - - - - - - xrdb -merge "$userresources" - fi if [ -f "$usermodmap" ]; then @@ -48,5 +33,10 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi +{{ if eq .chezmoi.hostname "helix" -}} +xinput set-prop 13 312 .8 +{{ else if eq .chezmoi.hostname "triangulum" -}} +xinput set-prop 10 306 1 +{{- end }} xsetroot -cursor_name left_ptr & exec bspwm diff --git a/dot_xinputrc b/dot_xinputrc deleted file mode 100644 index e344e1e..0000000 --- a/dot_xinputrc +++ /dev/null @@ -1 +0,0 @@ -xinput set-prop 13 312 .8