summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gnupg/gpg-agent.conf6
-rwxr-xr-x.xinitrc9
2 files changed, 8 insertions, 7 deletions
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index af2c254..0f3242d 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -5,8 +5,12 @@ max-cache-ttl 10000000
# max-cache-ttl-ssh 86400
# pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs
-pinentry-program /usr/bin/pinentry-gtk-2
+# pinentry-program /usr/bin/pinentry-gtk-2
# pinentry-program /usr/bin/pinentry-tty
allow-emacs-pinentry
allow-loopback-pinentry
# pinentry-program /home/bandali/usr/dl/pinentry-emacs
+
+# avoid blocking pinentry-gnome3 for several seconds, by not calling
+# to gnome-keyring
+no-allow-external-cache
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