X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/ca3a844af240ca87882522d14b530e0f1a6327ef..b157d7f5c608f4e180ba65d4bb8b84713edf6b3f:/.xinitrc

diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index c2feb42..ffb1aa0
--- a/.xinitrc
+++ b/.xinitrc
@@ -1 +1,9 @@
-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+# -*- mode: sh; sh-shell: sh -*-
+
+if [ -f "$HOME/.local/bin/startup-progs" ]; then
+   . "$HOME/.local/bin/startup-progs"
+fi
+
+# 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