Differentiate between host-specific startup progs and profiles

Mainly, that startup progs are programs/commands that need to be run
when starting a window manager, whereas profiles are generally sourced
at login time (including over ssh or tty) and don't necessarily have
anything to do with starting window managers.

diff --git a/.config/chaman.profile b/.config/chaman.profile
deleted file mode 100644 (file)
index 1c68d03..0000000
--- a/.config/chaman.profile
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: sh; sh-shell: sh -*-
-
-if [ $DISPLAY ]; then
-    if [ -x "$(command -v xinput)" ]; then
-        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:swap_rwin_rctl \
-        -option grp:shifts_toggle
-fi

diff --git a/.local/bin/chaman/startup b/.local/bin/chaman/startup
new file mode 100644 (file)
index 0000000..1c68d03
--- /dev/null
+++ b/.local/bin/chaman/startup
@@ -0,0 +1,12 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+if [ $DISPLAY ]; then
+    if [ -x "$(command -v xinput)" ]; then
+        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:swap_rwin_rctl \
+        -option grp:shifts_toggle
+fi

diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index cc641bf..2040de2 100755 (executable)
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -3,6 +3,10 @@
 resources="$HOME/.Xresources $HOME/.Xresources.d/$(hostname)"
 for res in $resources; do [ -f "$res" ] && xrdb -merge "$res"; done
 
 resources="$HOME/.Xresources $HOME/.Xresources.d/$(hostname)"
 for res in $resources; do [ -f "$res" ] && xrdb -merge "$res"; done
 

+if [ -f "$HOME/.local/bin/$(hostname)/startup" ]; then
+   . "$HOME/.local/bin/$(hostname)/startup"
+fi
+

 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