summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el20
1 files changed, 1 insertions, 19 deletions
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)