* .local/bin/startup-progs: Fix merging X reources files.

[~bandali/configs] / .local / bin / startup-progs

diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index 746b023..cc641bf 100755 (executable)
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -1,24 +1,7 @@
 #!/bin/sh
 
-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
-
-if [ -x "$(command -v xinput)" ]; then
-    xinput set-prop 'TPPS/2 IBM TrackPoint' 'libinput Accel Speed' -0.4
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Click Method Enabled' 0 1
-fi
-
-# setxkbmap \
-#     -layout us,ir \
-#     -option ctrl:nocaps \
-#     -option grp:shifts_toggle
-
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:swap_rwin_rctl \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
+resources="$HOME/.Xresources $HOME/.Xresources.d/$(hostname)"
+for res in $resources; do [ -f "$res" ] && xrdb -merge "$res"; done
 
 xsetroot -cursor_name left_ptr
 xset r rate 200 45