Various tweaks and fixes for using EXWM

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

diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index 746b023..39cb82f 100755 (executable)
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -1,31 +1,20 @@
 #!/bin/sh
 
 #!/bin/sh
 

-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+resources="$HOME/.Xresources $HOME/.Xresources.d/$(hostname)"
+for res in $resources; do [ -f "$res" ] && xrdb -merge "$res"; done

 
 

-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
+if [ -f "$HOME/.local/bin/$(hostname)/startup" ]; then
+   . "$HOME/.local/bin/$(hostname)/startup"

 fi
 
 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"
-

 xsetroot -cursor_name left_ptr
 xset r rate 200 45
 xset b off
 
 xsetroot -cursor_name left_ptr
 xset r rate 200 45
 xset b off
 

-light -N 1
+[ -x "$(command -v light)" ] && light -N 1

 
 

-[ -x "$(command -v dunst)" ]     && dunst &
+# [ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
+# [ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
+[ -x "$(command -v dunst)" ] && dunst &

 [ -x "$(command -v nm-applet)" ] && nm-applet &
 [ -x "$(command -v pasystray)" ] && pasystray -a &
 [ -x "$(command -v nm-applet)" ] && nm-applet &
 [ -x "$(command -v pasystray)" ] && pasystray -a &