Improve GPG integration

diff --git a/config.org b/config.org
index de1023aa90d5ef168c5175daad53703bcaf9df74..a09db5d3f4fe4608c6908ea175a692ad94c44f6a 100644 (file)
--- a/config.org
+++ b/config.org
@@ -615,8 +615,7 @@ Company-box adds icons.
 *** Magit
 # TODO: Write a command that commits hunk, skipping staging step.
 #+begin_src emacs-lisp
-  (use-package magit
-    :hook (magit-mode-hook. pinentry-start))
+  (use-package magit)
 #+end_src
 *** Colored diff in line number area
 #+begin_src emacs-lisp
@@ -770,12 +769,14 @@ No more clogging up init.el.
 ** GPG
 #+begin_src emacs-lisp
   (use-package epa-file
-    :straight (:type built-in))
-  (setq epa-file-select-keys nil
-        epa-file-encrypt-to '("me@armaanb.net")
-        password-cache-expiry (* 60 15))
+    :straight (:type built-in)
+    :custom
+    (epa-file-select-keys nil)
+    (epa-file-encrypt-to '("me@armaanb.net"))
+    (password-cache-expiry (* 60 15)))
 
-  (use-package pinentry)
+  (use-package pinentry
+    :config (pinentry-start))
 #+end_src
 ** Pastebin
 #+begin_src emacs-lisp