diff options
| -rw-r--r-- | host-ap-spotcap.local/emacs.d/private.el.gpg | bin | 797 -> 2258 bytes | |||
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 44 |
2 files changed, 26 insertions, 18 deletions
diff --git a/host-ap-spotcap.local/emacs.d/private.el.gpg b/host-ap-spotcap.local/emacs.d/private.el.gpg index 3a9a092d..aae4f977 100644 --- a/host-ap-spotcap.local/emacs.d/private.el.gpg +++ b/host-ap-spotcap.local/emacs.d/private.el.gpg Binary files differdiff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index 77c46741..df5069cf 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -13,7 +13,9 @@ Open Emacs with just a plain window. No graphics or messages, please! (setq inhibit-startup-echo-area-message (user-login-name))) (setq inhibit-startup-screen t) (setq gc-cons-threshold 100000000) -(setq file-name-handler-alist nil) +(setq file-name-handler-alist-backup file-name-handler-alist + file-name-handler-alist nil) +(remove-hook 'find-file-hooks #'vc-find-file-hook) #+END_SRC ** Scratch buffers @@ -485,7 +487,7 @@ based upon some folder conventions I use. (interactive "P") (ap/open-subfolder-project home-project-directory arg)) - (setq projectile-switch-project-action #'projectile-find-file + (setq projectile-switch-project-action #'projectile-commander projectile-remember-window-configs t projectile-completion-system 'ivy))) #+END_SRC @@ -1259,8 +1261,7 @@ rather useful. ** 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/"))) @@ -1291,24 +1292,22 @@ rather useful. (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 Sometimes I want to use the minibuffer, but I’m already inside it. @@ -1342,7 +1341,6 @@ replacement for helm so far. (use-package swiper :bind (("C-s" . swiper) ("C-r" . swiper) - ("C-c C-r" . ivy-resume) ("C-x i" . ivy-imenu-goto) ("C-=" . swiper)) :diminish ivy-mode @@ -2356,6 +2354,20 @@ somehow I prefer it. avy-keys '(?a ?r ?s ?t ?d ?h ?n ?e ?i ?\;)))) #+END_SRC +*** ace-link + +Visit any link. Despite the name, this works with avy. + +#+BEGIN_SRC emacs-lisp +(use-package ace-link + :after avy + :config (progn + (ace-link-setup-default) + (with-eval-after-load "gnus" + (bind-key "M-o" #'ace-link-gnus gnus-summary-mode-map) + (bind-key "M-o" #'ace-link-gnus gnus-article-mode-map)))) +#+END_SRC + ** goto-chg This is like popping the mark, only it filters to only change areas @@ -2552,9 +2564,5 @@ Start a server if possible. A daemon is already a server. (unless (server-running-p server-name) (server-start))))) (setq gc-cons-threshold 800000 - file-name-handler-alist '(("\\(?:\\.dz\\|\\.txz\\|\\.xz\\|\\.lzma\\|\\.lz\\|\\.g?z\\|\\.\\(?:tgz\\|svgz\\|sifz\\)\\|\\.tbz2?\\|\\.bz2\\|\\.Z\\)\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(?:~[[:digit:]]+\\)?~\\)?\\'" . jka-compr-handler) - ("\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'" . epa-file-handler) - ("\\`/[^/]*\\'" . tramp-completion-file-name-handler) - ("\\`/[^/|:][^/|]*:" . tramp-file-name-handler) - ("\\`/:" . file-name-non-special))) + file-name-handler-alist file-name-handler-alist-backup) #+END_SRC |