X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/94a3349df45219c12754c46752a41809653c5bfb..33a49682f3c40f116c327511b1d46c44d60e186c:/init.org

diff --git a/init.org b/init.org
index 5ab27cb..f58e843 100644
--- a/init.org
+++ b/init.org
@@ -76,7 +76,7 @@ file.
 ** License
 
 #+begin_src emacs-lisp :comments none
-;; Copyright (C) 2018  Amin Bandali <amin@aminb.org>
+;; Copyright (C) 2018  Amin Bandali <bandali@gnu.org>
 
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -191,7 +191,7 @@ but for now I've decided to keep them enabled. See documentation for
 
 #+begin_src emacs-lisp
 (setq user-full-name "Amin Bandali"
-      user-mail-address "amin@aminb.org")
+      user-mail-address "amin@bandali.me")
 #+end_src
 
 ** Package management
@@ -234,16 +234,18 @@ can then be managed with the help of Magit or other tools.
 (require 'borg)
 (borg-initialize)
 
-(require 'borg-nix-shell)
-(setq borg-build-shell-command 'borg-nix-shell-build-command)
+;; (require 'borg-nix-shell)
+;; (setq borg-build-shell-command 'borg-nix-shell-build-command)
 
 (with-eval-after-load 'bind-key
   (bind-keys
    :package borg
-   ("C-c B A" . borg-activate)
-   ("C-c B a" . borg-assimilate)
-   ("C-c B b" . borg-build)
-   ("C-c B c" . borg-clone)))
+   ("C-c b A" . borg-activate)
+   ("C-c b a" . borg-assimilate)
+   ("C-c b b" . borg-build)
+   ("C-c b c" . borg-clone)
+   ("C-c b m" . borg-insert-update-message)
+   ("C-c b r" . borg-remove)))
 #+end_src
 
 *** =use-package=
@@ -281,10 +283,9 @@ database, low-level functions for querying the database, and a
 (use-package epkg
   :defer t
   :bind
-  (("C-c B d" . epkg-describe-package)
-   ("C-c B p" . epkg-list-packages)
-   ("C-c B r" . borg-remove)
-   ("C-c B u" . epkg-update)))
+  (("C-c b d" . epkg-describe-package)
+   ("C-c b p" . epkg-list-packages)
+   ("C-c b u" . epkg-update)))
 #+end_src
 
 ** No littering in =~/.emacs.d=
@@ -324,6 +325,12 @@ it it's own file. While at it, treat themes as safe.
   (setf custom-safe-themes t))
 #+end_src
 
+** Secrets file
+
+#+begin_src emacs-lisp
+(load (no-littering-expand-etc-file-name "secrets"))
+#+end_src
+
 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up
@@ -341,7 +348,7 @@ in my shell.
   (exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
 #+end_src
 
-** Only one custom theme at a time
+** COMMENT Only one custom theme at a time
 
 #+begin_src emacs-lisp
 (defadvice load-theme (before clear-previous-themes activate)
@@ -361,20 +368,21 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm
 
 #+begin_src emacs-lisp
 (use-package server
+  :defer 1
   :config (or (server-running-p) (server-mode)))
 #+end_src
 
-** Unicode support
+** COMMENT Unicode support
 
 Font stack with better unicode support, around =Ubuntu Mono= and
 =Hack=.
 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (dolist (ft (fontset-list))
   (set-fontset-font
    ft
    'unicode
-   (font-spec :name "Ubuntu Mono"))
+   (font-spec :name "Source Code Pro" :size 14))
   (set-fontset-font
    ft
    'unicode
@@ -402,6 +410,12 @@ Font stack with better unicode support, around =Ubuntu Mono= and
    'prepend))
 #+end_src
 
+** Gentler font resizing
+
+#+begin_src emacs-lisp
+(setq text-scale-mode-step 1.05)
+#+end_src
+
 ** Libraries
 
 #+begin_src emacs-lisp
@@ -597,7 +611,7 @@ Enable automatic reloading of changed buffers and files.
 #+begin_src emacs-lisp
 (global-auto-revert-mode 1)
 (setq auto-revert-verbose nil
-      global-auto-revert-non-file-buffers t)
+      global-auto-revert-non-file-buffers nil)
 #+end_src
 
 *** Always use space for indentation
@@ -631,16 +645,28 @@ Enable =winner-mode=.
          (cons msg code)))
 #+end_src
 
+*** Search for non-ASCII characters
+
+I’d like non-ASCII characters such as ‘’“”«»‹›áⓐ𝒶 to be selected when
+I search for their ASCII counterpart.  Shoutout to [[http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html][endlessparentheses]]
+for this.
+
+#+begin_src emacs-lisp
+(setq search-default-mode #'char-fold-to-regexp)
+
+;; uncomment to extend this behaviour to query-replace
+;; (setq replace-char-fold t)
+#+end_src
+
 ** Bindings
 
 #+begin_src emacs-lisp
 (bind-keys
- ("C-c b k" . kill-this-buffer)
- ("C-c s s" . save-buffer)
- ("C-c b s" . save-buffer)
- ("C-c S"   . save-buffer)
- ("C-c o"   . other-window)
- ("C-c q q" . save-buffers-kill-terminal))
+ ("s-c e b" . eval-buffer)
+ ("s-c e r" . eval-region)
+
+ ("s-p"     . beginning-of-buffer)
+ ("s-n"     . end-of-buffer))
 #+end_src
 
 ** Packages
@@ -667,6 +693,147 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
+*** [[https://github.com/noctuid/general.el][general]]
+
+#+begin_src emacs-lisp
+(use-package general
+  :demand t
+  :config
+  (general-evil-setup t)
+  (general-override-mode)
+
+  (general-create-definer
+   amin--leader-keys
+   :keymaps 'override
+   :states '(emacs normal visual motion insert)
+   :non-normal-prefix "M-m"
+   :prefix "SPC"))
+#+end_src
+
+*** [[https://github.com/emacs-evil/evil][evil]]
+
+#+begin_src emacs-lisp
+(use-package evil
+  :demand t
+  ;; :hook (org-src-mode . evil-motion-state)
+  :config
+  (evil-mode 1)
+  (general-swap-key nil '(normal motion) ";" ":")
+
+  (setq evil-want-visual-char-semi-exclusive t
+        evil-cross-lines t)
+
+  ;; custom mode state mappings
+  (dolist (mspair '((ebdb-mode    . emacs)
+                    (helpful-mode . motion)
+                    (view-mode    . motion)))
+    (evil-set-initial-state (car mspair) (cdr mspair)))
+
+  ;; fix tab and indentation in src blocks inside org-mode buffer
+  ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
+  (unbind-key "TAB" evil-motion-state-map)
+
+  (unbind-key "C-d" evil-insert-state-map)
+  (unbind-key "C-v" evil-insert-state-map)
+  (unbind-key "C-y" evil-insert-state-map)
+  (unbind-key "C-a" evil-insert-state-map)
+  (unbind-key "C-e" evil-insert-state-map)
+  (unbind-key "C-p" evil-insert-state-map)
+  (unbind-key "C-n" evil-insert-state-map)
+  (unbind-key "C-k" evil-insert-state-map)
+  (bind-keys
+    :map evil-insert-state-map
+    ("C-k"   . kill-line)
+    ("C-S-k" . evil-insert-digraph)
+    :map evil-motion-state-map
+    ([down-mouse-1] . nil)))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package evil-escape
+  :after evil
+  :init
+  (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
+        evil-escape-excluded-major-modes '(neotree-mode)
+        evil-escape-key-sequence "jk"
+        evil-escape-delay 0.25)
+  ;; :general
+  ;; (:states '(insert replace visual operator)
+  ;;          "C-g" #'evil-escape)
+  :config
+  (evil-escape-mode 1)
+  ;; no `evil-escape' in minibuffer
+  (push #'minibufferp evil-escape-inhibit-functions))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package evil-nerd-commenter
+  :after evil
+  :general
+  (nmap
+    "gc" 'evilnc-comment-operator
+    "gy" 'evilnc-copy-and-comment-lines))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package evil-surround
+  :after evil
+  :general
+  (omap
+    "s" 'evil-surround-edit
+    "S" 'evil-Surround-edit)
+  (vmap
+    "S" 'evil-surround-region
+    "gS" 'evil-Surround-region))
+#+end_src
+
+#+begin_src emacs-lisp
+(amin--leader-keys
+  "/"   '(:ignore t :wk "search")
+
+  "a"   '(:ignore t :wk "apps")
+  "a i" 'ielm
+
+  "b"   '(:ignore t :wk "buffers")
+  "b k" 'kill-this-buffer
+  "b s" 'save-buffer
+
+  "e"   '(:ignore t :wk "eval")
+  "e b" 'eval-buffer
+  "e r" 'eval-region
+
+  "f"   '(:ignore t :wk "files")
+
+  "F"   '(:ignore t :wk "frames")
+  "F m" 'make-frame-command
+  "F d" 'delete-frame
+  "F D" 'delete-other-frames
+
+  "h"   '(:ignore t :wk "help(ful)")
+  "h c" 'describe-char
+  "h f" 'describe-function
+  "h F" 'describe-face
+  "h H" 'view-hello-file
+  "h i" 'info
+  "h k" 'describe-key
+  "h l" 'view-lossage
+  "h v" 'describe-variable
+
+  "o"   'other-window
+
+  "w"   '(:ignore t :wk "window")
+  "w o" 'other-window
+  "w 0" 'delete-window
+  "w 1" 'delete-other-windows
+  "w 2" 'split-window-below
+  "w 3" 'split-window-right
+  "w u" 'winner-undo
+  "w r" 'winner-redo
+
+  "q"   '(:ignore t :wk "quit")
+  "q q" 'save-buffers-kill-terminal)
+#+end_src
+
 *** [[https://orgmode.org/][Org mode]]
 
 #+begin_quote
@@ -679,15 +846,90 @@ In short, my favourite way of life.
 
 #+begin_src emacs-lisp
 (use-package org
+  :defer 3
+  :general
+  (amin--leader-keys
+    :states 'normal
+    :keymaps 'org-mode-map
+    "'" 'org-edit-special)
+  (amin--leader-keys
+    :definer 'minor-mode
+    :states 'normal
+    :keymaps 'org-src-mode
+    "'" 'org-edit-src-exit
+    "k" 'org-edit-src-abort)
+  (general-define-key
+   :definer 'minor-mode
+   :states 'normal
+   :keymaps 'org-src-mode
+   "q" 'org-edit-src-exit)
   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
         org-edit-src-content-indentation 0
+        org-email-link-description-format "Email %c: %s" ; %.30s
+        org-highlight-latex-and-related '(entities)
         org-log-done 'time)
-  :hook (org-mode . org-indent-mode))
+  (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
+  (after! org-src
+    (define-key org-src-mode-map [remap evil-write] 'org-edit-src-save)
+    (define-key org-src-mode-map [remap evil-save-and-close]
+      (lambda () (interactive)
+        (org-edit-src-save)
+        (org-edit-src-exit)))
+    (define-key org-src-mode-map [remap evil-save-modified-and-close]
+      (lambda () (interactive)
+        (org-edit-src-save)
+        (org-edit-src-exit)))
+    (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
+  (font-lock-add-keywords
+   'org-mode
+   '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
+      (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
+      (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
+      (4 '(:foreground "#c5c8c6") t))) ; title
+   t)
+  :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
+  :hook ((org-mode . org-indent-mode)
+         (org-mode . auto-fill-mode)
+         (org-mode . flyspell-mode))
+  :custom
+  (org-latex-packages-alist '(("" "listings") ("" "color")))
+  :custom-face
+  '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
+  '(org-block ((t (:background "#1d1f21"))))
+  '(org-latex-and-related ((t (:foreground "#b294bb")))))
+
+(use-package ox-latex
+  :after ox
+  :config
+  (setq org-latex-listings 'listings
+        ;; org-latex-prefer-user-labels t
+        )
+  (add-to-list 'org-latex-packages-alist '("" "listings"))
+  (add-to-list 'org-latex-packages-alist '("" "color"))
+  (add-to-list 'org-latex-classes
+               '("IEEEtran" "\\documentclass[11pt]{IEEEtran}"
+                 ("\\section{%s}" . "\\section*{%s}")
+                 ("\\subsection{%s}" . "\\subsection*{%s}")
+                 ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+                 ("\\paragraph{%s}" . "\\paragraph*{%s}")
+                 ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
+               t))
+
+(use-package ox-beamer
+  :after ox)
+
+(use-package ob-tangle
+  :general
+  (amin--leader-keys
+    :states 'normal
+    :keymaps 'org-mode-map
+    "b t" 'org-babel-tangle))
 
-(use-package org-notmuch
-  :after (:any org notmuch))
+(use-package orgalist
+  :after message
+  :hook (message-mode . orgalist-mode))
 #+end_src
 
 **** asynchronous tangle
@@ -748,30 +990,21 @@ Not just how I do git, but /the/ way to do git.
 
 #+begin_src emacs-lisp
 (use-package magit
-  :defer t
-  :bind
-  (("s-g"   . magit-dispatch-popup)
-   ("C-x g" . magit-status)
-   :prefix-map amin--magit-prefix-map
-   :prefix "C-c g"
-   ("SPC" . magit-status)
-   ("s"   . magit-status)
-   ("S"   . magit-status-prefix)
-   ("B"   . magit-blame)
-   ("C"   . magit-clone)
-   ("f"   . magit-fetch)
-   ("F"   . magit-pull)
-   ("P"   . magit-push)
-   ("p"   . magit-dispatch-popup)
-   ("c c" . magit-commit)
-   ("c a" . magit-commit-amend)
-   ("b b" . magit-checkout)
-   ("b c" . magit-branch))
+  :defer 2
+  :general (amin--leader-keys "g s" 'magit-status)
+  :bind ("s-g" . magit-status)
   :config
   (magit-add-section-hook 'magit-status-sections-hook
                           'magit-insert-modules
                           'magit-insert-stashes
-                          'append))
+                          'append)
+  (setq
+   magit-repository-directories '(("~/.emacs.d/" . 0)
+                                  ("~/src/git/" . 1)))
+  (nconc magit-section-initial-visibility-alist
+         '(([unpulled status] . show)
+           ([unpushed status] . show)))
+  :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
@@ -788,24 +1021,30 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package ivy
   :defer 1
+  :general (amin--leader-keys "," 'ivy-switch-buffer)
   :bind
-  (("C-c b b" . ivy-switch-buffer)
-   :map ivy-minibuffer-map
+  (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
    ([S-up]   . ivy-previous-history-element)
    ([S-down] . ivy-next-history-element)
    ("DEL"    . ivy-backward-delete-char))
   :config
   (setq ivy-wrap t)
-  (ivy-mode 1))
+  (ivy-mode 1)
+  ;; :custom-face
+  ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
+  ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
+  ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
+)
 #+end_src
 
 **** Swiper
 
 #+begin_src emacs-lisp
 (use-package swiper
-  :bind (([remap isearch-forward]  . swiper)
-         ([remap isearch-backward] . swiper)))
+  :general (:states '(normal motion) "/" 'swiper)
+  :bind (("C-s" . swiper)
+         ("C-r" . swiper)))
 #+end_src
 
 **** Counsel
@@ -813,12 +1052,16 @@ There's no way I could top that, so I won't attempt to.
 #+begin_src emacs-lisp
 (use-package counsel
   :defer 1
+  :general
+  (amin--leader-keys
+    "r" 'counsel-recentf
+    "SPC" 'counsel-M-x
+    "."   'counsel-find-file)
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("s-r"                            . counsel-recentf)
          ("C-c x"                          . counsel-M-x)
          ("C-c f ."                        . counsel-find-file)
-         ("C-c f r"                        . counsel-recentf)
          :map minibuffer-local-map
          ("C-r" . counsel-minibuffer-history))
   :config
@@ -830,6 +1073,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package eshell
+  :defer 1
   :commands eshell
   :config
   (eval-when-compile (defvar eshell-prompt-regexp))
@@ -846,20 +1090,28 @@ There's no way I could top that, so I won't attempt to.
     (eshell-send-input))
 
   (defun amin|eshell-setup ()
+    (make-local-variable 'company-idle-delay)
+    (setq company-idle-delay nil)
     (bind-keys :map eshell-mode-map
-               ("C-d" . amin/eshell-quit-or-delete-char)
-               ("C-l" . amin/eshell-clear)))
+               ("C-d"   . amin/eshell-quit-or-delete-char)
+               ("C-S-l" . amin/eshell-clear)
+               ("M-r"   . counsel-esh-history)
+               ([tab]   . company-complete)))
 
-  :hook (eshell-mode . amin|eshell-setup))
+  :hook (eshell-mode . amin|eshell-setup)
+  :custom
+  (eshell-hist-ignoredups t)
+  (eshell-input-filter 'eshell-input-filter-initial-space))
 #+end_src
 
 *** Ibuffer
 
 #+begin_src emacs-lisp
 (use-package ibuffer
+  :defer t
+  :general (amin--leader-keys "b b" 'ibuffer-other-window)
   :bind
   (("C-x C-b" . ibuffer-other-window)
-   ("C-c b B" . ibuffer-other-window)
    :map ibuffer-mode-map
    ("P"   . ibuffer-backward-filter-group)
    ("N"   . ibuffer-forward-filter-group)
@@ -878,7 +1130,7 @@ There's no way I could top that, so I won't attempt to.
   (ibuffer-saved-filter-groups
    '(("default"
       ("dired" (mode . dired-mode))
-      ("org"   (name . "^.*org$"))
+      ("org"   (mode . org-mode))
       ("web"
        (or
         (mode . web-mode)
@@ -898,7 +1150,10 @@ There's no way I could top that, so I won't attempt to.
       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
-        (name . "^\\*Messages\\*$"))))))
+        (name . "^\\*Messages\\*$")))
+      ("slack"
+       (or
+        (name . "^\\*Slack*"))))))
   (ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)
@@ -913,6 +1168,28 @@ There's no way I could top that, so I won't attempt to.
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 #+end_src
 
+*** Outline
+
+#+begin_src emacs-lisp
+(use-package outline
+  :defer t
+  :hook (prog-mode . outline-minor-mode)
+  :bind
+  (:map
+   outline-minor-mode-map
+   ("<s-tab>"  . outline-toggle-children)
+   ("M-p"      . outline-previous-visible-heading)
+   ("M-n"      . outline-next-visible-heading)
+   :prefix-map amin--outline-prefix-map
+   :prefix "s-o"
+   ("TAB" . outline-toggle-children)
+   ("a"   . outline-hide-body)
+   ("H"   . outline-hide-body)
+   ("S"   . outline-show-all)
+   ("h"   . outline-hide-subtree)
+   ("s"   . outline-show-subtree)))
+#+end_src
+
 * Borg's =layer/essentials=
 
 TODO: break this giant source block down into individual org sections.
@@ -937,7 +1214,9 @@ TODO: break this giant source block down into individual org sections.
 
 (use-package help
   :defer t
-  :config (temp-buffer-resize-mode))
+  :config
+  (temp-buffer-resize-mode)
+  (setq help-window-select t))
 
 (progn ;    `isearch'
   (setq isearch-allow-scroll t))
@@ -964,8 +1243,10 @@ TODO: break this giant source block down into individual org sections.
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
 (use-package recentf
-  :demand t
-  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:"))
+  :defer 0.5
+  :config
+  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
+  (setq recentf-max-saved-items 40))
 
 (use-package savehist
   :config (savehist-mode))
@@ -989,12 +1270,14 @@ TODO: break this giant source block down into individual org sections.
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree
-  :bind (("C-?" . undo-tree-undo)
-         ("M-_" . undo-tree-redo))
   :config
-  (global-undo-tree-mode)
-  (setq undo-tree-mode-lighter ""
-        undo-tree-auto-save-history t))
+  (global-undo-tree-mode -1))
+  ;; :bind (("C-?" . undo-tree-undo)
+  ;;        ("M-_" . undo-tree-redo))
+  ;; :config
+  ;; (global-undo-tree-mode)
+  ;; (setq undo-tree-mode-lighter ""
+  ;;       undo-tree-auto-save-history t))
 #+end_src
 
 * Editing
@@ -1003,12 +1286,12 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package company
-  :defer 5
+  :defer 2
   :bind
   (:map company-active-map
-        ([tab] . company-complete-common-or-cycle))
+        ([tab]    . company-complete-common-or-cycle)
+        ([escape] . company-abort))
   :custom
-  (company-idle-delay 0.3)
   (company-minimum-prefix-length 1)
   (company-selection-wrap-around t)
   (company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
@@ -1021,13 +1304,44 @@ TODO: break this giant source block down into individual org sections.
 * Syntax and spell checking
 #+begin_src emacs-lisp
 (use-package flycheck
+  :defer 3
   :hook (prog-mode . flycheck-mode)
+  :bind
+  (:map flycheck-mode-map
+        ("M-P" . flycheck-previous-error)
+        ("M-N" . flycheck-next-error))
   :config
   ;; Use the load-path from running Emacs when checking elisp files
   (setq flycheck-emacs-lisp-load-path 'inherit)
 
   ;; Only flycheck when I actually save the buffer
   (setq flycheck-check-syntax-automatically '(mode-enabled save)))
+
+;; http://endlessparentheses.com/ispell-and-apostrophes.html
+(use-package ispell
+  :defer 3
+  :config
+  ;; ’ can be part of a word
+  (setq ispell-local-dictionary-alist
+        `((nil "[[:alpha:]]" "[^[:alpha:]]"
+               "['\x2019]" nil ("-B") nil utf-8)))
+  ;; don't send ’ to the subprocess
+  (defun endless/replace-apostrophe (args)
+    (cons (replace-regexp-in-string
+           "’" "'" (car args))
+          (cdr args)))
+  (advice-add #'ispell-send-string :filter-args
+              #'endless/replace-apostrophe)
+
+  ;; convert ' back to ’ from the subprocess
+  (defun endless/replace-quote (args)
+    (if (not (derived-mode-p 'org-mode))
+        args
+      (cons (replace-regexp-in-string
+             "'" "’" (car args))
+            (cdr args))))
+  (advice-add #'ispell-parse-output :filter-args
+              #'endless/replace-quote))
 #+end_src
 * Programming modes
 
@@ -1035,6 +1349,7 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package alloy-mode
+  :defer t
   :config (setq alloy-basic-offset 2))
 #+end_src
 
@@ -1042,6 +1357,7 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package proof-site  ; Proof General
+  :defer t
   :load-path "lib/proof-site/generic/")
 #+end_src
 
@@ -1050,9 +1366,18 @@ TODO: break this giant source block down into individual org sections.
 #+begin_src emacs-lisp
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
+  :defer 1
   :bind (:map lean-mode-map
-              ("S-SPC" . company-complete)))
-#+end_src
+              ("S-SPC" . company-complete))
+  :config
+  (require 'lean-input)
+  (setq default-input-method "Lean"
+        lean-input-tweak-all '(lean-input-compose
+                               (lean-input-prepend "/")
+                               (lean-input-nonempty))
+        lean-input-user-translations '(("/" "/")))
+  (lean-input-setup))
+  #+end_src
 
 ** Haskell
 
@@ -1060,6 +1385,7 @@ TODO: break this giant source block down into individual org sections.
 
 #+begin_src emacs-lisp
 (use-package haskell-mode
+  :defer t
   :config
   (setq haskell-indentation-layout-offset 4
         haskell-indentation-left-offset 4
@@ -1083,6 +1409,7 @@ executable from [[https://github.com/mpickering/apply-refact][apply-refact]].
 
 #+begin_src emacs-lisp
 (use-package hlint-refactor
+  :after haskell-mode
   :bind (:map hlint-refactor-mode-map
               ("C-c l b" . hlint-refactor-refactor-buffer)
               ("C-c l r" . hlint-refactor-refactor-at-point))
@@ -1092,7 +1419,8 @@ executable from [[https://github.com/mpickering/apply-refact][apply-refact]].
 *** [[https://github.com/flycheck/flycheck-haskell][flycheck-haskell]]
 
 #+begin_src emacs-lisp
-(use-package flycheck-haskell)
+(use-package flycheck-haskell
+  :after haskell-mode)
 #+end_src
 
 *** [[https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el][hs-lint.el]]
@@ -1246,6 +1574,7 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package sgml-mode
+  :defer t
   :config
   (setq sgml-basic-offset 2))
 #+end_src
@@ -1254,6 +1583,7 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package css-mode
+  :defer t
   :config
   (setq css-indent-offset 2))
 #+end_src
@@ -1262,6 +1592,7 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package web-mode
+  :defer t
   :mode "\\.html\\'"
   :config
   (setq-every! 2
@@ -1274,13 +1605,104 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package emmet-mode
+  :after (:any web-mode css-mode sgml-mode)
   :bind* (("C-)" . emmet-next-edit-point)
           ("C-(" . emmet-prev-edit-point))
-  :init
+  :config
+  (unbind-key "C-j" emmet-mode-keymap)
   (setq emmet-move-cursor-between-quotes t)
   :hook (web-mode css-mode html-mode sgml-mode))
 #+end_src
 
+** Nix
+
+#+begin_src emacs-lisp
+(use-package nix-mode
+  :defer t
+  :mode "\\.nix\\'")
+#+end_src
+
+** Java
+
+*** meghanada
+
+#+begin_src emacs-lisp :tangle no
+(use-package meghanada
+  :bind
+  (:map meghanada-mode-map
+        (("C-M-o" . meghanada-optimize-import)
+         ("C-M-t" . meghanada-import-all)))
+  :hook (java-mode . meghanada-mode))
+#+end_src
+
+*** lsp-java
+
+#+begin_comment
+dependencies:
+
+ace-window
+avy
+bui
+company-lsp
+dap-mode
+lsp-java
+lsp-mode
+lsp-ui
+pfuture
+tree-mode
+treemacs
+#+end_comment
+
+#+begin_src emacs-lisp :tangle no
+(use-package treemacs
+  :config (setq treemacs-never-persist t))
+
+(use-package yasnippet
+  :config
+  ;; (yas-global-mode)
+  )
+
+(use-package lsp-mode
+  :init (setq lsp-eldoc-render-all nil
+              lsp-highlight-symbol-at-point nil)
+  )
+
+(use-package hydra)
+
+(use-package company-lsp
+  :after  company
+  :config
+  (setq company-lsp-cache-candidates t
+        company-lsp-async t))
+
+(use-package lsp-ui
+  :config
+  (setq lsp-ui-sideline-update-mode 'point))
+
+(use-package lsp-java
+  :config
+  (add-hook 'java-mode-hook
+	    (lambda ()
+	      (setq-local company-backends (list 'company-lsp))))
+
+  (add-hook 'java-mode-hook 'lsp-java-enable)
+  (add-hook 'java-mode-hook 'flycheck-mode)
+  (add-hook 'java-mode-hook 'company-mode)
+  (add-hook 'java-mode-hook 'lsp-ui-mode))
+
+(use-package dap-mode
+  :after lsp-mode
+  :config
+  (dap-mode t)
+  (dap-ui-mode t))
+
+(use-package dap-java
+  :after (lsp-java))
+
+(use-package lsp-java-treemacs
+  :after (treemacs))
+#+end_src
+
 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
@@ -1295,7 +1717,14 @@ Emacs package that displays available keybindings in popup
   :config (which-key-mode))
 #+end_src
 
-** [[https://github.com/seagle0128/doom-modeline][doom-modeline]]
+** theme
+
+#+begin_src emacs-lisp
+(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp")
+(load-theme 'tangomod t)
+#+end_src
+
+** doom-modeline
 
 #+begin_src emacs-lisp
 (use-package doom-modeline
@@ -1304,38 +1733,62 @@ Emacs package that displays available keybindings in popup
   :hook (after-init . doom-modeline-init))
 #+end_src
 
-** [[https://github.com/11111000000/tao-theme-emacs][tao-theme]]
+** doom-themes
 
-#+begin_src emacs-lisp :tangle no
-(use-package tao-theme
-  :demand t
-  :config (load-theme 'tao-yang t))
+#+begin_src emacs-lisp
+(use-package doom-themes)
 #+end_src
 
-** [[https://github.com/maio/eink-emacs][eink-theme]]
+** theme helper functions
 
 #+begin_src emacs-lisp
-(load-theme 'eink t)
+(defun amin/lights-on ()
+  "Enable my favourite light theme."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'tangomod t)))
+
+(defun amin/lights-off ()
+  "Go dark."
+  (interactive)
+  (progn
+    (mapc #'disable-theme custom-enabled-themes)
+    (load-theme 'doom-tomorrow-night t)))
+
+(amin--leader-keys
+  "t"   '(:ignore t :wk "theme")
+  "t d" 'amin/lights-off
+  "t l" 'amin/lights-on)
 #+end_src
 
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp
 (use-package crux
-  :bind (("C-c d"   . crux-duplicate-current-line-or-region)
-         ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)
-         ("C-c b K" . crux-kill-other-buffers)
-         ("C-c f c" . crux-copy-file-preserve-attributes)
-         ("C-c f D" . crux-delete-file-and-buffer)
-         ("C-c f R" . crux-rename-file-and-buffer)
-         ("C-S-j"   . crux-top-join-line)
-         ("C-c j"   . crux-top-join-line)))
+  :defer 1
+  :general
+  (amin--leader-keys
+    "b K" 'crux-kill-other-buffers
+    "c d" 'crux-duplicate-current-line-or-region
+    "c D" 'crux-duplicate-and-comment-current-line-or-region
+    "f c" 'crux-copy-file-preserve-attributes
+    "f d" 'crux-delete-file-and-buffer
+    "f r" 'crux-rename-file-and-buffer)
+  :bind (("C-c d" . crux-duplicate-current-line-or-region)
+         ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
+         ("C-S-j" . crux-top-join-line)
+         ("C-c j" . crux-top-join-line)))
 #+end_src
 
 ** [[https://github.com/alezost/mwim.el][mwim]]
 
 #+begin_src emacs-lisp
 (use-package mwim
+  :general
+  (:states '(normal visual)
+           "0" 'mwim-beginning-of-code-or-line
+           "$" 'mwim-end-of-code-or-line)
   :bind (("C-a"    . mwim-beginning-of-code-or-line)
          ("C-e"    . mwim-end-of-code-or-line)
          ("<home>" . mwim-beginning-of-line-or-code)
@@ -1346,7 +1799,7 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package projectile
-  :defer 5
+  :defer 2
   :bind-keymap ("C-c p" . projectile-command-map)
   :config
   (projectile-mode)
@@ -1367,22 +1820,63 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package helpful
-  :bind
-  (("C-h f"   . helpful-callable)
-   ("C-h v"   . helpful-variable)
-   ("C-h k"   . helpful-key)
-   ("C-c C-d" . helpful-at-point)
-   ("C-h F"   . helpful-function)
-   ("C-h C"   . helpful-command)))
+  :defer 1
+  :general
+  (amin--leader-keys
+    "h h"   '(:ignore t :wk "helpful")
+    "h h c" 'helpful-command
+    "h h f" 'helpful-callable           ; helpful-function
+    "h h v" 'helpful-variable
+    "h h k" 'helpful-key
+    "h h p" 'helpful-at-point))
 #+end_src
 
-** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
 
 #+begin_src emacs-lisp
-(use-package shell-pop
+(use-package shell-toggle
+  :after eshell
+  :general (amin--leader-keys "a s" 'amin/shell-toggle)
+  :bind ("C-c e" . amin/shell-toggle)
+  :config
+  (defun amin/shell-toggle (make-cd)
+    "Toggle between the shell buffer and whatever buffer you are editing.
+With a prefix argument MAKE-CD also insert a \"cd DIR\" command
+into the shell, where DIR is the directory of the current buffer.
+
+When called in the shell buffer returns you to the buffer you were editing
+before calling this the first time.
+
+Options: `shell-toggle-goto-eob'"
+    (interactive "P")
+    ;; Try to decide on one of three possibilities:
+    ;; If not in shell-buffer, switch to it.
+    ;; If in shell-buffer, return to state before going to the shell-buffer
+    (if (eq (current-buffer) shell-toggle-shell-buffer)
+        (shell-toggle-buffer-return-from-shell)
+      (progn
+        (shell-toggle-buffer-goto-shell make-cd)
+        (if shell-toggle-full-screen-window-only (delete-other-windows)))))
+
+  ;; override to split horizontally instead
+  (defun shell-toggle-buffer-switch-to-other-window ()
+    "Switch to other window.
+If the current window is the only window in the current frame,
+create a new window and switch to it.
+
+\(This is less intrusive to the current window configuration than
+`switch-buffer-other-window')"
+    (let ((this-window (selected-window)))
+      (other-window 1)
+      ;; If we did not switch window then we only have one window and need to
+      ;; create a new one.
+      (if (eq this-window (selected-window))
+	      (progn
+	        (split-window-horizontally)
+            (other-window 1)))))
+
   :custom
-  (shell-pop-universal-key "C-c e")
-  (shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+  (shell-toggle-launch-shell 'shell-toggle-eshell))
 #+end_src
 
 ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
@@ -1391,9 +1885,11 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 #+begin_src emacs-lisp
 (use-package unkillable-scratch
+  :defer 3
   :config
   (unkillable-scratch 1)
   :custom
+  (unkillable-scratch-behavior 'do-nothing)
   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 #+end_src
 
@@ -1407,6 +1903,7 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 #+begin_src emacs-lisp
 (use-package boxquote
+  :defer 3
   :bind
   (:prefix-map amin--boxquote-prefix-map
    :prefix "C-c q"
@@ -1434,13 +1931,14 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
-** [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
+** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]                                 :ARCHIVE:
 
 #+begin_src emacs-lisp
 (use-package highlight-indent-guides
-  :demand t
+  :defer 3
   :hook ((prog-mode . highlight-indent-guides-mode)
-         (org-mode  . highlight-indent-guides-mode))
+         ;; (org-mode  . highlight-indent-guides-mode)
+         )
   :config
   (setq highlight-indent-guides-character ?\|)
   (setq highlight-indent-guides-auto-enabled nil)
@@ -1450,223 +1948,430 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too
 #+end_src
 
+** pdf-tools
+
+#+begin_src emacs-lisp
+(use-package pdf-tools
+  :defer t
+  :magic ("%PDF" . pdf-view-mode)
+  :config
+  (setq pdf-view-resize-factor 1.05)
+  (pdf-tools-install)
+  :bind
+  (:map pdf-view-mode-map
+        ("C-s" . isearch-forward)
+        ("C-r" . isearch-backward)
+        ("j"   . pdf-view-next-line-or-next-page)
+        ("k"   . pdf-view-previous-line-or-previous-page)
+        ("h"   . image-backward-hscroll)
+        ("l"   . image-forward-hscroll)))
+#+end_src
+
+** anzu
+
+#+begin_src emacs-lisp
+(use-package anzu)
+#+end_src
+
+** typo.el
+
+#+begin_src emacs-lisp
+(use-package typo
+  :defer 2
+  :config
+  (typo-global-mode 1)
+  :hook (text-mode . typo-mode))
+#+end_src
+
+** slack
+
+Hopefully temporary.
+
+#+begin_src emacs-lisp
+(use-package slack
+  :commands (slack-start)
+  :init
+  (eval-when-compile                    ; silence the byte-compiler
+    (defvar url-http-data nil)
+    (defvar url-http-extra-headers nil)
+    (defvar url-http-method nil)
+    (defvar url-callback-function nil)
+    (defvar url-callback-arguments nil)
+    (defvar oauth--token-data nil))
+  (setq slack-buffer-emojify t
+        slack-prefer-current-team t)
+  :config
+  (slack-register-team
+   :name "uw-apv"
+   :default t
+   :client-id uw-apv-client-id
+   :client-secret uw-apv-client-secret
+   :token uw-apv-token
+   :subscribed-channels '(general)
+   :full-and-display-names t)
+  (slack-register-team
+   :name "watform"
+   :default nil
+   :client-id watform-client-id
+   :client-secret watform-client-secret
+   :token watform-token
+   :subscribed-channels '(general)
+   :full-and-display-names t)
+  (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
+  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
+        lui-time-stamp-only-when-changed-p t
+        lui-time-stamp-position 'right)
+  :bind
+  (("C-c s s" . slack-start)
+   ("C-c s u" . slack-select-unread-rooms)
+   ("C-c s b" . slack-select-rooms)
+   ("C-c s t" . slack-change-current-team)
+   ("C-c s c" . slack-ws-close)
+   :map slack-mode-map
+   ("M-p"     . slack-buffer-goto-prev-message)
+   ("M-n"     . slack-buffer-goto-next-message)
+   ("C-c e"   . slack-message-edit)
+   ("C-c k"   . slack-message-delete)
+   ("C-c C-k" . slack-channel-leave)
+   ("C-c r a" . slack-message-add-reaction)
+   ("C-c r r" . slack-message-remove-reaction)
+   ("C-c r s" . slack-message-show-reaction-users)
+   ("C-c p l" . slack-room-pins-list)
+   ("C-c p a" . slack-message-pins-add)
+   ("C-c p r" . slack-message-pins-remove)
+   ("@"       . slack-message-embed-mention)
+   ("#"       . slack-message-embed-channel)))
+
+(use-package alert
+  :commands (alert)
+  :init
+  (setq alert-default-style 'notifier))
+#+end_src
+
+** hl-todo
+
+#+begin_src emacs-lisp
+(use-package hl-todo
+  :defer 4
+  :config
+  (global-hl-todo-mode))
+#+end_src
+
+** shrink-path
+
+#+begin_src emacs-lisp
+(use-package shrink-path
+  :after eshell
+  :config
+  (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
+        eshell-prompt-function #'+eshell/prompt)
+
+  (defun +eshell/prompt ()
+    (let ((base/dir (shrink-path-prompt default-directory)))
+      (concat (propertize (car base/dir)
+                          'face 'font-lock-comment-face)
+              (propertize (cdr base/dir)
+                          'face 'font-lock-constant-face)
+              (propertize (+eshell--current-git-branch)
+                          'face 'font-lock-function-name-face)
+              "\n"
+              (propertize "λ" 'face 'eshell-prompt-face)
+              ;; needed for the input text to not have prompt face
+              (propertize " " 'face 'default))))
+
+  (defun +eshell--current-git-branch ()
+    (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
+                             when (string-match "^\*" match)
+                             collect match))))
+      (if (not (eq branch nil))
+          (concat " " (substring branch 2))
+        ""))))
+#+end_src
+
+** magithub
+
+For when I /have to/ use GH.
+
+#+begin_src emacs-lisp
+(use-package magithub
+  :after magit
+  :config
+  (magithub-feature-autoinject t)
+  (setq magithub-clone-default-directory "~/src/git"))
+#+end_src
+
+** [[https://github.com/peterwvj/eshell-up][eshell-up]]
+
+#+begin_src emacs-lisp
+(use-package eshell-up
+  :after eshell)
+#+end_src
+
 * Email
-** [[https://notmuchmail.org][notmuch]]
 
-See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
+#+begin_src emacs-lisp
+(defvar amin-maildir (expand-file-name "~/mail/"))
+(after! recentf
+  (add-to-list 'recentf-exclude amin-maildir))
+#+end_src
+
+** Gnus
 
 #+begin_src emacs-lisp
-(defvar amin-maildir "~/mail")
+(setq
+ amin-gnus-init-file (no-littering-expand-etc-file-name "gnus")
+ mail-user-agent     'gnus-user-agent
+ read-mail-command   'gnus)
+
+(use-package gnus
+  :general
+  (amin--leader-keys
+    "m" 'gnus
+    "M" 'gnus-unplugged)
+  :bind (("s-m" . gnus)
+         ("s-M" . gnus-unplugged))
+  :init
+  (setq
+   gnus-select-method '(nnnil "")
+   gnus-secondary-select-methods
+   '((nnimap "amin"
+            (nnimap-stream plain)
+            (nnimap-address "127.0.0.1")
+            (nnimap-server-port 143)
+            (nnimap-authenticator plain)
+            (nnimap-user "amin@aminb.org"))
+     (nnimap "uwaterloo"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@uwaterloo.ca")))
+   gnus-message-archive-group "nnimap+amin:Sent"
+   gnus-parameters
+   '(("gnu.*"
+      (gcc-self . t)))
+   gnus-large-newsgroup  50
+   gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
+   gnus-directory        (concat gnus-home-directory "news/")
+   message-directory     (concat gnus-home-directory "mail/")
+   nndraft-directory     (concat gnus-home-directory "drafts/")
+   gnus-save-newsrc-file nil
+   gnus-read-newsrc-file nil
+   gnus-interactive-exit nil
+   gnus-gcc-mark-as-read t))
+
+(use-package gnus-art
+  :config
+  (setq
+   gnus-visible-headers
+   (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:")
+   gnus-sorted-header-list
+   '("^From:" "^Subject:" "^Summary:" "^Keywords:"
+     "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator"
+     "^Newsgroups:" "List-Id:" "^Organization:"
+     "^User-Agent:" "^Date:")
+  ;; local-lapsed article dates
+  ;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11
+  gnus-article-date-headers '(user-defined)
+  gnus-article-time-format
+  (lambda (time)
+    (let* ((date (format-time-string "%a, %d %b %Y %T %z" time))
+           (local (article-make-date-line date 'local))
+           (combined-lapsed (article-make-date-line date
+                                                    'combined-lapsed))
+           (lapsed (progn
+                     (string-match " (.+" combined-lapsed)
+                     (match-string 0 combined-lapsed))))
+      (concat local lapsed))))
+  (bind-keys
+   :map gnus-article-mode-map
+   ("r"   . gnus-article-reply-with-original)
+   ("R"   . gnus-article-wide-reply-with-original)
+   ("M-L" . org-store-link)))
+
+(use-package gnus-sum
+  :bind (:map gnus-summary-mode-map
+              :prefix-map amin--gnus-summary-prefix-map
+              :prefix "v"
+              ("r" . gnus-summary-reply)
+              ("w" . gnus-summary-wide-reply)
+              ("v" . gnus-summary-show-raw-article))
+  :config
+  (bind-keys
+   :map gnus-summary-mode-map
+   ("r"   . gnus-summary-reply-with-original)
+   ("R"   . gnus-summary-wide-reply-with-original)
+   ("M-L" . org-store-link)))
+
+(use-package gnus-msg
+  :config
+  (setq gnus-posting-styles
+        '((".*"
+           (address "amin@bandali.me")
+           (body "\nBest,\namin\n")
+           (signature-file "~/.signature-amin")
+           (eval (setq amin--message-cite-say-hi t)))
+          ("gnu.*"
+           (address "bandali@gnu.org")
+           (signature-file nil))
+          ((header "subject" "ThankCRM")
+           (to "webmasters-comment@gnu.org")
+           (body "\nAdded  to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
+           (eval (setq amin--message-cite-say-hi nil)))
+          ("nnimap\\+uwaterloo:.*"
+           (address "abandali@uwaterloo.ca")
+           (gcc "\"nnimap+uwaterloo:Sent Items\"")
+           (signature-file nil)))))
+
+(use-package gnus-topic
+  :hook (gnus-group-mode . gnus-topic-mode))
+
+(use-package gnus-agent
+  :config
+  (setq gnus-agent-synchronize-flags 'ask)
+  :hook (gnus-group-mode . gnus-agent-mode))
+
+(use-package gnus-group
+  :config
+  (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)"))
+
+(use-package mm-decode
+  :config
+  (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
+#+end_src
 
+** sendmail
+
+#+begin_src emacs-lisp
 (use-package sendmail
-  ;; :ensure nil
   :config
   (setq sendmail-program "/usr/bin/msmtp"
-        ; message-sendmail-extra-arguments '("-v" "-d")
+        ;; message-sendmail-extra-arguments '("-v" "-d")
         mail-specify-envelope-from t
         mail-envelope-from 'header))
+#+end_src
+
+** message
 
+#+begin_src emacs-lisp
 (use-package message
-  ;; :ensure nil
   :config
-  (setq message-kill-buffer-on-exit t
+  (defconst amin--message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
+  (defconst message-cite-style-bandali
+    '((message-cite-function  'message-cite-original)
+      (message-citation-line-function  'message-insert-formatted-citation-line)
+      (message-cite-reply-position 'traditional)
+      (message-yank-prefix  "> ")
+      (message-yank-cited-prefix  ">")
+      (message-yank-empty-prefix  ">")
+      (message-citation-line-format
+       (if amin--message-cite-say-hi
+           (concat "Hi %F,\n\n" amin--message-cite-style-format)
+         amin--message-cite-style-format)))
+    "Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
+  (setq message-cite-style 'message-cite-style-bandali
+        message-kill-buffer-on-exit t
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
-        message-directory "drafts"
+        message-dont-reply-to-names
+        "\\(\\(amin@bandali\\.me\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
         message-user-fqdn "aminb.org")
-  (add-hook 'message-mode-hook
-            (lambda () (setq fill-column 65
-                        message-fill-column 65)))
-  (add-hook 'message-mode-hook
-            #'flyspell-mode)
-  ;; (add-hook 'notmuch-message-mode-hook #'+doom-modeline|set-special-modeline)
-  ;; TODO: is there a way to only run this when replying and not composing?
-  ;; (add-hook 'notmuch-message-mode-hook
-  ;;           (lambda () (progn
-  ;;                   (newline)
-  ;;                   (newline)
-  ;;                   (forward-line -1)
-  ;;                   (forward-line -1))))
-  ;; (add-hook 'message-setup-hook
-  ;;           #'mml-secure-message-sign-pgpmime)
+  :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
+         (message-mode . flyspell-mode)
+         (message-mode . (lambda () (setq fill-column 65
+                                     message-fill-column 65))))
+  ;; :custom-face
+  ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
+  ;; (message-header-to      ((t (:foreground "#111" :weight normal))))
+  ;; (message-header-cc      ((t (:foreground "#333" :weight normal))))
   )
 
 (after! mml-sec
   (setq mml-secure-openpgp-encrypt-to-self t
         mml-secure-openpgp-sign-with-sender t))
+#+end_src
 
-(defun amin/notmuch ()
-  "Delete other windows, then launch `notmuch'."
-  (interactive)
-  (delete-other-windows)
-  (notmuch))
+** footnote
 
-(use-package notmuch
-  :commands notmuch
-  :bind ("C-c m" . amin/notmuch)
-  :custom (notmuch-always-prompt-for-sender t)
-  :config
-  (setq notmuch-hello-sections
-        '(notmuch-hello-insert-header
-          notmuch-hello-insert-saved-searches
-          ;; notmuch-hello-insert-search
-          notmuch-hello-insert-alltags)
-        notmuch-search-oldest-first nil
-        notmuch-show-all-tags-list t
-        notmuch-message-headers  ; see bug follow-up above
-        '("Subject" "To" "Cc" "Date" "List-Id" "X-RT-Originator")
-        notmuch-hello-thousands-separator ","
-        notmuch-fcc-dirs
-        '(("amin@aminb.org"        . "amin/Sent")
-          ("amin@gnu.org"          . "gnu/Sent")
-          ("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
-          ("mab@gnu.org"           . "gnu/Sent")
-          ("aminb@gnu.org"         . "gnu/Sent")
-          (".*"                    . "sent"))
-        notmuch-search-result-format
-        '(("date"    . "%12s ")
-          ("count"   . "%-7s ")
-          ("authors" . "%-40s ")
-          ("subject" . "%s ")
-          ("tags"    . "(%s)"))
-        notmuch-saved-searches
-        '((:name "inbox"     :query "tag:inbox"     :key "i")
-          (:name "unread"    :query "tag:unread"    :key "u")
-          (:name "latest"    :query "tag:latest"    :key "l")
-          (:name "encrypted" :query "tag:encrypted" :key "e")
-          (:name "flagged"   :query "tag:flagged"   :key "f")
-          (:name "sent"      :query "tag:sent"      :key "s")
-          (:name "drafts"    :query "tag:draft"     :key "d")
-          (:name "all mail"  :query "*"             :key "a")))
-  ;; (add-hook 'visual-fill-column-mode-hook
-  ;;           (lambda ()
-  ;;             (when (string= major-mode 'notmuch-message-mode)
-  ;;               (setq visual-fill-column-width 70))))
-  ;; (set! :evil-state 'notmuch-message-mode 'insert)
-  ;; (advice-add #'notmuch-bury-or-kill-this-buffer
-  ;;             :override #'kill-this-buffer)
+Convenient footnotes in =message-mode=.
+
+#+begin_src emacs-lisp
+(use-package footnote
+  :after message
   :bind
-  (:map notmuch-hello-mode-map
-        ("u" . (lambda ()
-                 "Search for `unread'-tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:unread")))
-        ("i" . (lambda ()
-                 "Search for `inbox'-tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:inbox")))
-        ("l" . (lambda ()
-                 "Search for `latest'-tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:latest")))
-        ("e" . (lambda ()
-                 "Search for `encrypted'-tagged messages"
-                 (interactive)
-                 (notmuch-hello-search "tag:encrypted"))))
-  (:map notmuch-search-mode-map
-        ("k" . (lambda ()
-                 "Mark message read"
-                 (interactive)
-                 (notmuch-search-tag '("-unread"))
-                 ;; (notmuch-search-archive-thread)
-                 (notmuch-search-next-thread)))
-        ("u" . (lambda ()
-                 "Mark message unread"
-                 (interactive)
-                 (notmuch-search-tag '("+unread"))
-                 (notmuch-search-next-thread)))
-        ("K" . (lambda ()
-                 "Mark message deleted"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "+deleted"))
-                 (notmuch-search-next-thread)))
-        ("S" . (lambda ()
-                 "Mark message as spam"
-                 (interactive)
-                 (notmuch-search-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-search-next-thread))))
-  (:map notmuch-tree-mode-map
-        ("k" . (lambda ()
-                 "Mark message read"
-                 (interactive)
-                 (notmuch-tree-tag '("-unread"))
-                 ;; (notmuch-tree-archive-thread)
-                 (notmuch-tree-next-message)))
-        ("u" . (lambda ()
-                 "Mark message unread"
-                 (interactive)
-                 (notmuch-tree-tag '("+unread"))
-                 (notmuch-tree-next-message)))
-        ("K" . (lambda ()
-                 "Mark message deleted"
-                 (interactive)
-                 (notmuch-tree-tag '("-unread" "-inbox" "+deleted"))
-                 (notmuch-tree-next-message)))
-        ("S" . (lambda ()
-                 "Mark message as spam"
-                 (interactive)
-                 (notmuch-tree-tag '("-unread" "-inbox" "-webmasters" "+spam"))
-                 (notmuch-tree-next-message)))))
-
-(use-package counsel-notmuch
-  :bind ("C-c s m" . counsel-notmuch))
-
-(after! notmuch-crypto
-  (setq notmuch-crypto-process-mime t))
+  (:map message-mode-map
+        :prefix-map amin--footnote-prefix-map
+        :prefix "C-c f"
+        ("a" . footnote-add-footnote)
+        ("b" . footnote-back-to-message)
+        ("c" . footnote-cycle-style)
+        ("d" . footnote-delete-footnote)
+        ("g" . footnote-goto-footnote)
+        ("r" . footnote-renumber-footnotes)
+        ("s" . footnote-set-style))
+  :config
+  (setq footnote-start-tag ""
+        footnote-end-tag   ""
+        footnote-style     'unicode))
+#+end_src
 
-(after! recentf
-  (add-to-list 'recentf-exclude (expand-file-name amin-maildir)))
+** bbdb
+
+Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup),
+because installing it from source on Emacs 27 using the following
+submodule configuration for some reason doesn’t work and results in
+very strange errors when using any of the functions.
+
+#+begin_src conf :tangle no
+[submodule "bbdb"]
+	path = lib/bbdb
+	url = https://git.savannah.nongnu.org/git/bbdb.git
+	load-path = lisp
+	info-path = doc
+	build-step = ./autogen.sh
+	build-step = ./configure
+	build-step = make
+	build-step = make install
 #+end_src
 
-** supercite
+I tried using =borg-elpa= instead of doing it like this, but it added
+2 seconds to my startup time, which is unacceptable to me.
 
-#+begin_src emacs-lisp :tangle no
-(use-package supercite
-  :commands sc-cite-original
+#+begin_src emacs-lisp
+(use-package bbdb
+  :load-path "lisp/bbdb"
   :init
-  (add-hook 'mail-citation-hook 'sc-cite-original)
-
-  (defun sc-remove-existing-signature ()
-    (save-excursion
-      (goto-char (region-beginning))
-      (when (re-search-forward message-signature-separator (region-end) t)
-        (delete-region (match-beginning 0) (region-end)))))
+  (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
+  (bbdb-mua-auto-update-init 'message)
+  (setq bbdb-mua-auto-update-p 'query)
+  (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus))
+#+end_src
 
-  (add-hook 'mail-citation-hook 'sc-remove-existing-signature)
+** COMMENT message-x
 
-  (defun sc-remove-if-not-mailing-list ()
-    (unless (assoc "list-id" sc-mail-info)
-      (setq attribution sc-default-attribution
-            citation (concat sc-citation-delimiter
-                             sc-citation-separator))))
+#+begin_src emacs-lisp
+(use-package message-x
+  :custom
+  (message-x-completion-alist
+   (quote
+    (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address)
+     ((if
+          (boundp
+           (quote message-newgroups-header-regexp))
+          message-newgroups-header-regexp message-newsgroups-header-regexp)
+      . message-expand-group)))))
+#+end_src
 
-  (add-hook 'sc-attribs-postselect-hook 'sc-remove-if-not-mailing-list)
+** COMMENT gnus-harvest
 
+#+begin_src emacs-lisp
+(use-package gnus-harvest
+  :commands gnus-harvest-install
+  :demand t
   :config
-  (defun sc-fill-if-different (&optional prefix)
-    "Fill the region bounded by `sc-fill-begin' and point.
-Only fill if optional PREFIX is different than
-`sc-fill-line-prefix'.  If `sc-auto-fill-region-p' is nil, do not
-fill region.  If PREFIX is not supplied, initialize fill
-variables.  This is useful for a regi `begin' frame-entry."
-    (if (not prefix)
-        (setq sc-fill-line-prefix ""
-              sc-fill-begin (line-beginning-position))
-      (if (and sc-auto-fill-region-p
-               (not (string= prefix sc-fill-line-prefix)))
-          (let ((fill-prefix sc-fill-line-prefix))
-            (unless (or (string= fill-prefix "")
-                        (save-excursion
-                          (goto-char sc-fill-begin)
-                          (or (looking-at ">+  +")
-                              (< (length
-                                  (buffer-substring (point)
-                                                    (line-end-position)))
-                                 65))))
-              (fill-region sc-fill-begin (line-beginning-position)))
-            (setq sc-fill-line-prefix prefix
-                  sc-fill-begin (line-beginning-position)))))
-nil))
+  (if (featurep 'message-x)
+      (gnus-harvest-install 'message-x)
+    (gnus-harvest-install)))
 #+end_src
 
 * Blogging
@@ -1675,6 +2380,9 @@ nil))
 #+begin_src emacs-lisp
 (use-package ox-hugo
   :after ox)
+
+(use-package ox-hugo-auto-export
+  :load-path "lib/ox-hugo")
 #+end_src
 
 * Post initialization