mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-09-19 11:28:07 -04:00
Moved xinputrc to xinitrc
This commit is contained in:
parent
7e48e6b08b
commit
0cd92ab9d5
2 changed files with 8 additions and 19 deletions
|
@ -2,21 +2,14 @@
|
||||||
|
|
||||||
userresources=$HOME/.Xresources
|
userresources=$HOME/.Xresources
|
||||||
usermodmap=$HOME/.Xmodmap
|
usermodmap=$HOME/.Xmodmap
|
||||||
sysresources=/etc/X11/xinit/.Xresources
|
sysresources=/etc/X11/xinit/Xresources
|
||||||
sysmodmap=/etc/X11/xinit/.Xmodmap
|
sysmodmap=/etc/X11/xinit/Xmodmap
|
||||||
|
|
||||||
|
|
||||||
# merge in defaults and keymaps
|
# merge in defaults and keymaps
|
||||||
|
|
||||||
if [ -f $sysresources ]; then
|
if [ -f $sysresources ]; then
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xrdb -merge $sysresources
|
xrdb -merge $sysresources
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f $sysmodmap ]; then
|
if [ -f $sysmodmap ]; then
|
||||||
|
@ -24,15 +17,7 @@ if [ -f $sysmodmap ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$userresources" ]; then
|
if [ -f "$userresources" ]; then
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xrdb -merge "$userresources"
|
xrdb -merge "$userresources"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$usermodmap" ]; then
|
if [ -f "$usermodmap" ]; then
|
||||||
|
@ -48,5 +33,10 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
|
||||||
unset f
|
unset f
|
||||||
fi
|
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 &
|
xsetroot -cursor_name left_ptr &
|
||||||
exec bspwm
|
exec bspwm
|
|
@ -1 +0,0 @@
|
||||||
xinput set-prop 13 312 .8
|
|
Loading…
Reference in a new issue