summaryrefslogtreecommitdiffstats
path: root/.xinitrc
diff options
context:
space:
mode:
Diffstat (limited to '.xinitrc')
-rwxr-xr-x.xinitrc9
1 files changed, 3 insertions, 6 deletions
diff --git a/.xinitrc b/.xinitrc
index a888a36..ffb1aa0 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,12 +1,9 @@
# -*- mode: sh; sh-shell: sh -*-
-#if [ -f "$HOME/.profile" ]; then
-# . "$HOME/.profile";
-#fi
-
if [ -f "$HOME/.local/bin/startup-progs" ]; then
. "$HOME/.local/bin/startup-progs"
fi
-# LC_ALL=C twm &
-[ -x "$(command -v emacs)" ] && exec ssh-agent 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