X-Git-Url: http://git.shemshak.org/~bandali/configs/blobdiff_plain/1f5c92ffb2a1c3cb52b01195e664876be7b69047..9d3e290041382bd77f3e58d75dfd760420fe4d57:/.xinitrc?ds=inline

diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index b0e828e..ffb1aa0
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,18 +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
-
-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