diff options
| -rw-r--r-- | emacs/.emacs.d/ap-spotcap.local.el.gpg | bin | 1333 -> 0 bytes | |||
| -rw-r--r-- | emacs/.emacs.d/main.el | 59 | ||||
| -rw-r--r-- | nix/.config/nixpkgs/emacs.nix | 4 |
3 files changed, 13 insertions, 50 deletions
diff --git a/emacs/.emacs.d/ap-spotcap.local.el.gpg b/emacs/.emacs.d/ap-spotcap.local.el.gpg deleted file mode 100644 index 1751ca5f..00000000 --- a/emacs/.emacs.d/ap-spotcap.local.el.gpg +++ /dev/null Binary files differdiff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index e79c6055..768e336f 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -1294,6 +1294,12 @@ ;; ** Documentation +;; *** helpful + +;; #+BEGIN_SRC emacs-lisp +(use-package helpful) +;; #+END_SRC + ;; *** ehelp ;; ehelp is a less well-known package that’s part of Emacs and slightly @@ -1340,22 +1346,9 @@ ;; #+END_SRC ;; ** Mail -;; *** Gnus - -;; At work, I use gnus for email. Some of the setup is specific to my -;; workplace, so I keep it in a host-specific, GPG-encrypted file. +;; *** Basics ;; #+BEGIN_SRC emacs-lisp -(use-package gnus - :config (progn - (setq gnus-gcc-mark-as-read t - mml-secure-openpgp-encrypt-to-self t - send-mail-function #'smtpmail-send-it - message-send-mail-function #'smtpmail-send-it))) - -(with-eval-after-load "gnus-mime" - (define-key gnus-mime-button-map " " #'gnus-mime-view-part-externally)) - (with-eval-after-load "mailcap" (when (eq system-type 'darwin) (mailcap-add-mailcap-entry "application" "pdf" '((viewer . "/usr/bin/qlmanage -p %s") (type . "application/pdf"))))) @@ -1363,6 +1356,9 @@ (with-eval-after-load "mm-decode" (add-to-list 'mm-discouraged-alternatives "text/html") (add-to-list 'mm-discouraged-alternatives "text/richtext")) + +(with-eval-after-load "mml-sec" + (setq mml-secure-openpgp-encrypt-to-self t)) ;; #+END_SRC ;; *** mu @@ -1424,26 +1420,6 @@ "alan@alanpearce.co.uk")))) ;; #+END_SRC -;; *** BBDB - -;; As I'm using Emacs for email, it makes sense to have contact -;; information here as well. - -;; #+BEGIN_SRC emacs-lisp -(use-package bbdb - :config (progn - (bbdb-initialize 'gnus 'message 'pgp) - (bbdb-mua-auto-update-init 'gnus 'message) - (setq bbdb-send-mail-style 'gnus - bbdb-complete-mail-allow-cycling t - bbdb-mua-auto-update t - bbdb-mua-pop-up-window-size 3 - bbdb-mua-update-interactive-p '(query . create) - bbdb-message-all-addresses t - bbdb-offer-save t - bbdb-offer-to-create 1))) -;; #+END_SRC - ;; ** Misc ;; #+BEGIN_SRC emacs-lisp @@ -1770,16 +1746,6 @@ (add-hook 'markdown-mode-hook #'turn-on-auto-fill))) ;; #+END_SRC -;; *** Lentic - -;; Multiple different views of the same file. Can be used for a kind of -;; inverse literate programming. - -;; #+BEGIN_SRC emacs-lisp -(use-package lentic - :config (global-lentic-mode)) -;; #+END_SRC - ;; *** Outshine ;; Org-ified source code. I think this might work better than @@ -2690,10 +2656,7 @@ (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)))) + (ace-link-setup-default))) ;; #+END_SRC ;; *** goto-chg diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix index 6ce3a210..aface0fa 100644 --- a/nix/.config/nixpkgs/emacs.nix +++ b/nix/.config/nixpkgs/emacs.nix @@ -51,8 +51,7 @@ in diminish bind-key use-package - smartparens - lentic + smartparens ]) ++ (with epkgs.melpaPackages; [ ace-link ace-window @@ -107,6 +106,7 @@ in goto-chg haskell-mode highlight-stages + helpful imenu-anywhere indium jinja2-mode |