X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/aea662c560fb8fcd37e741adf67be9127f45f03a..c361e41e77aa99a606d407f03aac86e8530481a7:/.xinitrc?ds=sidebyside

diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index efd4e31..ffb1aa0
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,20 +1,9 @@
-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+# -*- mode: sh; sh-shell: sh -*-
 
-if [ -x "$(command -v xinput)" ]; then
-   xinput --set-prop "TPPS/2 IBM TrackPoint" 'libinput Accel Speed' -0.4
+if [ -f "$HOME/.local/bin/startup-progs" ]; then
+   . "$HOME/.local/bin/startup-progs"
 fi
 
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:nocaps \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
-
-xsetroot -cursor_name left_ptr
-xset r rate 200 45
-xset b off
-
-[ -x "$(command -v pasystray)" ] && pasystray -a &
-[ -x "$(command -v nm-applet)" ] && nm-applet &
-EDITOR=nano exec emacs -ib 0
+# launch with dbus in part so that pinentry-gnome3 -- seemingly the
+# pinentry du jour -- doesn't fall back to curses and screw us.
+[ -x "$(command -v emacs)" ] && dbus-run-session ssh-agent emacs -ib 0