diff options
| -rw-r--r-- | .config/guix/manifest/jirud.scm | 2 | ||||
| -rw-r--r-- | .emacs.d/init.el | 20 | ||||
| -rw-r--r-- | .gnupg/gpg-agent.conf | 10 |
3 files changed, 6 insertions, 26 deletions
diff --git a/.config/guix/manifest/jirud.scm b/.config/guix/manifest/jirud.scm index 92a67ff..1949ca7 100644 --- a/.config/guix/manifest/jirud.scm +++ b/.config/guix/manifest/jirud.scm @@ -35,7 +35,7 @@ "openssh" ;; "openssl" "password-store" - "pinentry-emacs" + "pinentry" ;; "poppler" ;for 'pdffonts' "rsync" "rtv" diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 601d8e3..ab634c8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -304,27 +304,9 @@ For disabling the behaviour for certain buffers and/or modes." :defer 0.4 :config (pixel-scroll-mode 1)) -;; ask for GPG passphrase in minibuffer -(use-feature epa - :custom - ; this will fail if gpg>=2.1 is not available - (epa-pinentry-mode 'loopback)) - (use-feature epg-config - :defer 0.4 :custom - ((epg-gpg-program (executable-find "gpg")) - (epg-pinentry-mode 'loopback))) - -(use-feature epg - :after epg-config) - -(use-package pinentry - :demand - :after (epa epg server) - :config - (setq pinentry--socket-dir server-socket-dir) - (pinentry-start)) + ((epg-gpg-program (executable-find "gpg")))) ;; useful libraries (require 'cl-lib) diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index b0ff3ac..1b59d64 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1,9 +1,7 @@ default-cache-ttl 43200 -max-cache-ttl 43200 +max-cache-ttl 86400 -default-cache-ttl-ssh 10800 -max-cache-ttl-ssh 10800 +default-cache-ttl-ssh 43200 +max-cache-ttl-ssh 86400 -pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs -allow-emacs-pinentry -allow-loopback-pinentry +pinentry-program /home/bandali/.guix-profile/bin/pinentry |