all repos — nixfiles @ d1bf36ed1e8dc1a3ec5d2a99aa6d335dd3381246

System and user configuration, managed by nix and home-manager

Emacs: Fix loading private elisp

Alan Pearce
commit

d1bf36ed1e8dc1a3ec5d2a99aa6d335dd3381246

parent

3eb1cb331f686b37d752bdfbb690631eae2df4db

1 file changed, 7 insertions(+), 10 deletions(-)

jump to
M tag-emacs/emacs.d/init.orgtag-emacs/emacs.d/init.org
@@ -1261,8 +1261,7 @@
** Auxillary Configuration #+BEGIN_SRC emacs-lisp -;; (require 'pinentry) -;; (require 'epa) +(require 'pinentry) (defvar have-private-key (file-exists-p (expand-file-name "secring.gpg" "~/.gnupg/")))
@@ -1293,23 +1292,21 @@ (message "ERROR: Private GPG key not found")
(unless (getenv "GPG_AGENT_INFO") (start-process "gpg-agent" nil "gpg-agent" "--daemon") (setenv "SSH_AUTH_SOCK" gpg-agent-ssh-sock)) - (setq password-cache-expiry nil - pinentry--socket-dir temporary-file-directory) + (setq password-cache-expiry nil) (unless (file-exists-p (concat pinentry--socket-dir "pinentry")) (pinentry-start) (add-hook 'kill-emacs-hook 'pinentry-stop)) (add-to-list 'load-suffixes ".el.gpg") - (load-gpg "private") - (kill-buffer "*Pinentry*"))) + (load-gpg (expand-file-name "private" user-emacs-directory)))) (defun first-frame-hook (frame) - (remove-hook 'after-make-frame-functions 'first-frame-hook) + (remove-hook 'after-make-frame-functions #'first-frame-hook) (run-at-time nil nil 'load-private-data)) -(add-hook 'after-make-frame-functions 'first-frame-hook) +(if (eq 1 (length (frame-list))) + (add-hook 'after-init-hook #'load-private-data) + (add-hook 'after-make-frame-functions #'first-frame-hook)) #+END_SRC - - * Minibuffer