Switch to use-package

1 files changed, 949 insertions, 1387 deletions

@@ -1,1228 +1,977 @@
-;;; emacs init --- an init for emacs  -*- lexical-binding: t; -*-
+;;; init.el --- a config of one's own  -*- lexical-binding: t; -*-
 ;; by C. Duckworth <acdw@acdw.net>
-;; URL: https://git.acdw.net/emacs
-;; Bankruptcy: 9
-;;
-;; Everyone is permitted to do whatever they like with this software
-;; without limitation.  This software comes without any warranty
-;; whatsoever, but with two pieces of advice:
-;; - Be kind to yourself.
-;; - Make good choices.
-
-(yoke +emacs
-  (require* '+emacs '+window '+lisp)
-  ;; Settings
-  (setc truncate-string-ellipsis "…"
-        ring-bell-function #'ignore
-        read-file-name-completion-ignore-case t
-        comment-auto-fill-only-comments t
-        password-cache t
-        password-cache-expiry (* 60 60)
-        switch-to-buffer-in-dedicated-window 'pop
-        switch-to-buffer-obey-display-actions t
-        initial-buffer-choice (defun +initial-buffer-choose ()
-                                (cond
-                                 ((equal (get-buffer "*Messages*")
-                                         (other-buffer))
-                                  (get-buffer "*scratch*"))
-                                 (:else (other-buffer)))))
-  ;; "Safe" variables
-  (dolist (var+pred
-           '((browse-url-browser-function
-              ;; All types defined by custom are safe.
-              . (lambda (f)
-                  ;; Whooooo boy
-                  (memq f (mapcar (lambda (i)
-                                    (plist-get (cdr i) :value))
-                                  (seq-filter
-                                   (lambda (i)
-                                     (eq (car i) 'function-item))
-                                   (cdr (get 'browse-url-browser-function
-                                             'custom-type)))))))))
-    (put (car var+pred) 'safe-local-variable (cdr var+pred)))
-  ;; Keys
-  (defkeys t
-    "C-x C-k" #'kill-current-buffer
-    "C-/" #'undo-only
-    "C-?" #'undo-redo
-    "C-x C-c" (defun delete-frame-or-quit (arg)
-                (interactive "P")
-                (cond (arg (delete-frame nil :force))
-                      ((= 1 (length (frame-list)))
-                       (and (yes-or-no-p "Kill emacs? ")
-                            (save-buffers-kill-emacs t)))
-                      (:else (delete-frame))))
-    "C-x r q" (defun really-quit-emacs (arg)
-                (interactive "P")
-                (cond (arg (save-buffers-kill-emacs t))
-                      (:else (save-buffers-kill-terminal t))))
-    "M-SPC" #'+cycle-spacing
-    ;; "M-/" #'hippie-expand ; `hippie-completing-read'
-    "M-=" #'count-words
-    "C-x C-b" #'ibuffer
-    "C-x 4 n" #'clone-buffer
-    "S-<down-mouse-1>" #'mouse-set-mark
-    "C-x 0" #'+delete-window-or-bury-buffer
-    ;; "M-j" nil ; `avy'
-    "<Scroll_Lock>" nil
-    "C-z" nil
-    "M-o" #'other-window|switch-buffer
-    "C-M-;" #'+lisp-comment-or-uncomment-sexp
-    "C-x 5 z" #'suspend-frame
-    "C-x f" #'find-file
-    "C-c t" (defmap toggle-map
-              "A map for toggling various settings."
-              "d" (defmap toggle-debug-map
-                    "Easily toggle debug flavors."
-                    "e" #'toggle-debug-on-error
-                    "q" #'toggle-debug-on-quit)
-              "w" #'toggle-word-wrap
-              "t" #'toggle-truncate-lines
-              "c" #'column-number-mode
-              "l" #'line-number-mode
-              "v" (defmap toggle-view-map
-                    "Easily toggle UI elements' views."
-                    "c" #'display-fill-column-indicator-mode
-                    "l" #'display-line-numbers-mode
-                    "m" #'menu-bar-mode
-                    "t" #'tool-bar-mode
-                    "s" #'scroll-bar-mode)))
-  (defkeys text-mode-map
-    "C-M-k" #'kill-paragraph
-    "C-o" (defun open-paragraph (&optional arg)
-            "Open a paragraph after paragraph at point.
-A paragraph is defined as continguous non-empty lines of text
-surrounded by empty lines, so opening a paragraph means to make
-three blank lines, then place the point on the second one.
-
-Called with prefix ARG, open a paragraph before point."
-            ;; TODO: Take an integer as ARG, allowing for skipping paragraphs up and down.
-            (interactive "*P")
-            ;; Go to next blank line.  This /isn't/ `end-of-paragraph-text' because
-            ;; that's weird with org, and I'm guessing other modes too.
-            (unless (looking-at "^$") (forward-line (if arg -1 +1)))
-            (while (and (not (looking-at "^$"))
-                        (= 0 (forward-line (if arg -1 +1)))))
-            (newline)
-            (when arg (newline) (forward-line -2))
-            (delete-blank-lines)
-            (newline 2)
-            (previous-line)))
-  ;; Hooks
-  (add-hook 'after-save-hook
-            #'executable-make-buffer-file-executable-if-script-p)
-  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
-  (add-hook 'find-file-not-found-functions #'+auto-create-missing-dirs)
-  (add-hook 'text-mode-hook #'abbrev-mode)
-  (add-hook 'find-file-hook #'+vc-off-when-remote)
-  (add-hook 'prog-mode-hook #'auto-fill-mode)
-  ;; Advice
-  (add-function :after after-focus-change-function
-                #'+save-some-buffers-debounce)
-  (define-advice keyboard-escape-quit (:around (fn &rest r) keep-window-open)
-    "Don't close quits on `keyboard-escape-quit'."
-    (let ((buffer-quit-function #'ignore))
-      (apply fn r)))
-  ;; Faces
-  (set-face-attribute 'default nil :family "Comic Code" :height 100)
-  (set-face-attribute 'bold nil :family "Comic Code" :weight 'bold)
-  (set-face-attribute 'variable-pitch nil :family "Comic Code")
-  ;; Modes
-  (winner-mode))
-
-(yoke custom                            ; This is `cus-edit' but meh
-  (require '+custom)
-  (setf custom-file (private/ "custom.el"))
-  (add-to-list* '+custom-allowed-variables
-    'safe-local-variable-values
-    'warning-suppress-types
-    'ispell-buffer-session-localwords)
-  (eval-after init
-    (+custom-load-some-customizations :noerror)))
-
-;; (yoke modus-themes
-;;   (setc modus-themes-bold-constructs t
-;;         modus-themes-italic-constructs t
-;;         modus-themes-headings '((1 monochrome bold italic)
-;;                                 (2 monochrome bold)
-;;                                 (3 monochrom italic)
-;;                                 (t monochrome)))
-;;   (defhook modus-themes-after-load-theme-hook
-;;     :name modus-monochrome
-;;     (modus-themes-with-colors
-;;       (cl-loop for x being the symbols
-;;                if (string-match-p "\\`font-lock-.*-face\\'"
-;;                                   (symbol-name x))
-;;                do
-;;                (custom-set-faces
-;;                 `(,x ((,class :foreground
-;;                               ,(cond
-;;                                 ((memq x '(font-lock-string-face
-;;                                            font-lock-doc-face
-;;                                            font-lock-doc-markup-face))
-;;                                  fg-special-warm)
-;;                                 ((memq x '(font-lock-warning-face))
-;;                                  fg-lang-warning)
-;;                                 ((memq x '(font-lock-comment-face))
-;;                                  fg-alt)
-;;                                 (:else 'unspecified))
-;;                               :background unspecified
-;;                               :weight
-;;                               ,(cond
-;;                                 ((memq x '(font-lock-keyword-face))
-;;                                  'bold)
-;;                                 (:else 'normal))
-;;                               :slant
-;;                               ,(cond
-;;                                 ((memq x '(font-lock-doc-face
-;;                                            font-lock-comment-face))
-;;                                  'italic)
-;;                                 (:else 'normal))
-;;                               :underline
-;;                               ,(cond
-;;                                 ((memq x '(font-lock-warning-face))
-;;                                  t)
-;;                                 (:else nil)))))))))
-;;   (when (or (custom-theme-enabled-p 'modus-operandi)
-;;             (custom-theme-enabled-p 'modus-vivendi))
-;;     (modus-monochrome))
-;;   (cond ((require 'dawn nil :noerrer)
-;;          (defhook +custom-after-load-hook
-;;            :name dawn@custom
-;;            (load-theme 'modus-operandi :noconfirm :noenable)
-;;            (load-theme 'modus-vivendi :noconfirm :noenable)
-;;            (dawn-schedule #'modus-themes-load-operandi
-;;                           #'modus-themes-load-vivendi)))
-;;         (:else (modus-themes-load-operandi))))
-
-(yoke time
-  (setc display-time-mail-function
-        (defun +notmuch-new-mail-p ()
-          (plist-get (cl-find "inbox+unread"
-                              (ignore-errors
-                                (notmuch-hello-query-counts notmuch-saved-searches))
-                              :key (lambda (l) (plist-get l :name))
-                              :test #'equal)
-                     :count))
-        display-time-use-mail-icon nil
-        display-time-mail-string (format "⋅ Mail (%s)" (+notmuch-new-mail-p))
-        read-mail-command #'+notmuch-goto
-        display-time-format " %a %-e, %H:%M"
-        ;; `display-time-format' makes these unnecessary, but I'll keep em
-        display-time-24hr-format t
-        display-time-day-and-date t
-        display-time-default-load-average nil)
-  (define-advice display-time-update (:after (&rest _) update-mail-count)
-    (setq display-time-mail-string (format "⋅ Mail (%s)" (+notmuch-new-mail-p))))
-  (display-time-mode))
-
-(yoke pita
-  (require 'pita)
-  (advice-add 'indent-region :before #'with-region-or-buffer))
-
-(yoke (undo-fu-session "https://codeberg.org/ideasman42/emacs-undo-fu-session")
-  (setc undo-fu-session-incompatible-files '("/COMMIT_EDITMSG\\'"
-                                             "/git-rebase-todo\\'")
-        undo-fu-session-directory (.etc "undo/" t)
-        undo-fu-session-compression (cond
-                                     ((executable-find "gzip") 'gz)
-                                     ((executable-find "bzip2") 'bz2)
-                                     ((executable-find "xz") 'xz)
-                                     (t nil)))
-  (global-undo-fu-session-mode))
-
-(yoke whitespace
-  (setc  whitespace-line-column nil
-         whitespace-style '( face trailing
-                             tabs tab-mark
-                             indentation
-                             space-after-tab space-before-tab))
-  (defhook (text-mode-hook prog-mode-hook read-only-mode-hook)
-    :name +whitespace-mode-for-writable-buffers
-    :doc "Turn on `whitespace-mode' if the buffer is writable, off otherwise."
-    (whitespace-mode (if buffer-read-only -1 t)))
-  (defhook before-save-hook #'whitespace-cleanup)
-  (define-advice whitespace-cleanup (:around (fn &rest r) preserve-point)
-    (let ((col (current-column)))
-      (apply fn r)
-      (move-to-column col t)
-      (set-buffer-modified-p nil))))
-
-(yoke elisp-mode
-  (setc eval-expression-print-length nil ; remove ellipses from `eval-expression'
-        eval-expression-print-level nil)
-  (defkeys (emacs-lisp-mode-map lisp-interaction-mode-map)
-    "C-c C-c" #'eval-defun
-    "C-c C-k" (defun +elisp-eval-region-or-buffer ()
-                (interactive)
-                (cond
-                 ((region-active-p)
-                  (eval-region (region-beginning) (region-end))
-                  (message "Region evaluated."))
-                 (t
-                  (eval-buffer)
-                  (message "Buffer %s evaluated." (buffer-name)))))
-    "C-c C-z" #'ielm)
-  (define-advice eval-region (:around (fn beg end &rest args) pulse)
-    (apply fn beg end args)
-     (pulse-momentary-highlight-region beg end)))
-
-(yoke isearch
-  (defkeys t
-    "C-s" #'isearch-forward-regexp
-    "C-r" #'isearch-backward-regexp
-    "C-M-s" #'isearch-forward
-    "C-M-r" #'isearch-backward))
+;; Bankruptcy: 9.3
+
+;;; Code:
+
+;;; Remove when done bankrupting
+
+(defkeys t "C-x C-c" #'restart-emacs)
+
+;;; My extras
+
+(push (expand-file-name (locate-user-emacs-file "lisp")) load-path)
+(require 'acdw)                         ; Omnibus fun stuff
+
+;;; Basic defaults
+
+(use-package no-littering
+  :ensure t
+  :demand t
+  :custom
+  (no-littering-etc-directory etc/)
+  (no-littering-var-directory var/)
+  (custom-file (etc/ "custom.el"))
+  (auto-save-file-name-transforms `(("." ,(var/ "auto-save/") t)))
+  (auto-save-list-file-prefix (var/ "auto-save/.saves-" t))
+  (backup-directory-alist `(("." . ,(var/ "backup/" t)))))
+
+(use-package custom-allowed
+  :load-path "~/src/emacs/custom-allowed/"
+  :custom
+  (custom-file (private/ "custom.el"))
+  :config
+  (dolist (var '(safe-local-variable-values
+                 warning-suppress-types
+                 ispell-buffer-session-localwords
+                 calendar-latitude
+                 calendar-longitude
+                 user-full-name
+                 user-mail-address))
+    (add-to-list 'custom-allowed-variables var))
+  :hook
+  (after-init-hook . custom-allowed-load-custom-file))
+
+(use-package modus-themes
+  :load-path "~/usr/share/emacs/30.0.50/etc/themes/"
+  :custom
+  (modus-themes-bold-constructs t)
+  (modus-themes-italic-constructs t)
+  (modus-themes-variable-pitch-ui nil))
+
+(use-package dawn
+  :load-path "~/src/emacs/dawn/"
+  :after modus-themes
+  :config
+  (load-theme 'modus-operandi :noconfirm :noenable)
+  (load-theme 'modus-vivendi :noconfirm :noenable)
+  (defhook custom-allowed-after-load-hook
+    (dawn-schedule-themes 'modus-operandi
+                          'modus-vivendi)
+    (set-face-attribute 'default nil
+                        :family "IBM Plex Mono"
+                        :height 100)
+    (set-face-attribute 'variable-pitch nil
+                        :family "Georgia"
+                        :height 1.2)))
+
+(use-package midnight
+  :config
+  (add-hook 'midnight-mode-hook #'recentf-cleanup)
+  (midnight-mode))
+
+(use-package sophomore
+  :load-path "~/src/emacs/sophomore/"
+  :config
+  (sophomore-enable-all)
+  (sophomore-disable 'view-hello-file
+                     'describe-gnu-project
+                     'suspend-frame)
+  (sophomore-mode))
+
+;;; Completions
+
+(use-package vertico
+  :ensure t
+  :custom
+  (resize-mini-windows 'grow-only)
+  (vertico-cycle t)
+  :init
+  (use-package vertico-directory
+    :after vertico
+    :config
+    (add-hook 'rfn-eshadow-update-overlay-hook #'vertico-directory-tidy))
+  (vertico-mode))
+
+(use-package marginalia
+  :ensure t
+  :demand t
+  :config
+  (add-hook 'minibuffer-setup-hook #'truncate-lines-local-mode)
+  (marginalia-mode))
 
-(yoke ispell
-  (require* '+ispell 'ispell)
-  (add-hook 'before-save-hook
-            #'+ispell-move-buffer-words-to-dir-locals-hook)
-  (setc ispell-program-name (or (executable-find "ispell")
-                                (executable-find "aspell")))
-  (put 'ispell-buffer-session-localwords
-       'safe-local-variable #'+ispell-safe-local-p))
-
-
-(yoke mouse
-  ;; Brand new for Emacs 28: see https://ruzkuku.com/texts/emacs-mouse.html
-  ;; Actually, look at this as well: https://www.emacswiki.org/emacs/Mouse3
-  (when (fboundp 'context-menu-mode)
-    (setc context-menu-functions '(context-menu-ffap
-                                   context-menu-region
-                                   context-menu-undo
-                                   ;; context-menu-dictionary
-                                   ))
-    (context-menu-mode +1))
-  (dolist (click '(;; Fix scrolling in the margin
-                   wheel-down double-wheel-down triple-wheel-down
-                   wheel-up double-wheel-up triple-wheel-up))
-    (global-set-key (vector 'right-margin click) 'mwheel-scroll)
-    (global-set-key (vector 'left-margin click) 'mwheel-scroll)))
-
-(yoke dired
-  (require 'dired-x)
-  (setc dired-recursive-copies 'always
-        dired-recursive-deletes 'always
-        dired-create-destination-dirs 'always
-        dired-do-revert-buffer t
-        dired-hide-details-hide-symlink-targets nil
-        dired-isearch-filenames 'dwim
-        delete-by-moving-to-trash t
-        dired-auto-revert-buffer t
-        dired-listing-switches "-AlF"
-        ls-lisp-dirs-first t
-        dired-ls-F-marks-symlinks t
-        dired-clean-confirm-killing-deleted-buffers nil
-        dired-no-confirm '(byte-compile
-                           load chgrp chmod chown
-                           copy move hardlink symlink
-                           shell touch)
-        dired-dwim-target t)
-  (setq-local-hook dired-mode-hook
-    truncate-lines t)
-  (defkeys t
-    "C-x C-j" #'dired-jump
-    [remap list-directory] #'dired)
-  (defkeys ((dired-mode-map :after dired))
-    "<backspace>" #'dired-up-directory
-    "C-j" #'dired-up-directory)
-  (defhook dired-mode-hook
-    #'dired-hide-details-mode
-    #'hl-line-mode))
-
-(yoke (dired-hacks "https://github.com/Fuco1/dired-hacks")
-  (defkeys dired-mode-map
-    "TAB" #'dired-subtree-sycle
-    "i" #'dired-subtree-toggle)
-  (defhook 'dired-mode-hook
-    #'dired-collapse-mode))
-
-(yoke auth-source
-  (setc auth-sources `(default "secrets:passwords"))
-  (setq-local-hook authinfo-mode-hook
-    truncate-lines t))
-
-(yoke (consult "https://github.com/minad/consult")
-  (require 'consult)
-  (setf register-preview-delay 0
-        register-preview-function #'consult-register-format
-        xref-show-xrefs-function #'consult-xref
-        tab-always-indent 'complete
-        completion-in-region-function #'consult-completion-in-region
-        consult-narrow-key "<"
-        consult--regexp-compiler #'consult--default-regexp-compiler)
+(use-package orderless
+  :ensure t
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-overrides
+   '((file (styles basic partial-completion)))))
+
+(use-package consult
+  :ensure t
+  :custom
+  (register-preview-delay 0.01)
+  (register-preview-function #'consult-register-format)
+  (xref-show-xrefs-function #'consult-xref)
+  (tab-always-indent 'complete)
+  (completion-in-region-function #'consult-completion-in-region)
+  (consult-narrow-key "<")
+  (consult--regexp-compiler #'consult--default-regexp-compiler)
+  :config
   (advice-add #'register-preview :override #'consult-register-window)
-  (define-key* (current-global-map)
-               ;; Etc
-               "M-S-x" #'consult-mode-command
-               ;; C-c bindings (mode-specific-map)
-               "C-c h" #'consult-history
-               "C-c b" #'consult-bookmark
-               "C-c k" #'consult-kmacro
-               ;; C-x bindings (ctl-x-map)
-               "C-x M-:" #'consult-complex-command
-               "C-x b" #'consult-buffer
-               "C-x 4 b" #'consult-buffer-other-window
-               "C-x 5 b" #'consult-buffer-other-frame
-               ;; Custom M-# bindings for fast register access
-               "M-#" #'consult-register-load
-               "M-'" #'consult-register-store
-               "C-M-#" #'consult-register
-               ;; Other custom bindings
-               "M-y" #'consult-yank-pop
-               ;;("<f1> a" . consult-apropos)
-               ;; M-g bindings (goto-map)
-               "M-g e" #'consult-compile-error
-               "M-g f" #'consult-flymake ; or consult-flycheck
-               "M-g g" #'consult-goto-line
-               "M-g M-g" #'consult-goto-line
-               "M-g o" #'consult-outline ; or consult-org-heading
-               "M-g m" #'consult-mark
-               "M-g k" #'consult-global-mark
-               "M-g i" #'consult-imenu
-               "M-g M-i" #'consult-imenu
-               "M-g I" #'consult-imenu-multi
-               ;; M-s bindings (search-map)
-               "M-s f" #'consult-find
-               "M-s F" #'consult-locate
-               "M-s g" #'consult-grep
-               "M-s G" #'consult-git-grep
-               "M-s r" #'consult-ripgrep
-               "M-s l" #'consult-line
-               "M-s L" #'consult-line-multi
-               "M-s m" #'consult-multi-occur
-               "M-s k" #'consult-keep-lines
-               "M-s u" #'consult-focus-lines
-               ;; Isearch integration
-               "M-s e" #'consult-isearch-history)
-  (eval-after isearch-mode
-    (define-key* isearch-mode-map
-                 "M-e" #'consult-isearch-history
-                 "M-s e" #'consult-isearch-history
-                 "M-s l" #'consult-line
-                 "M-s L" #'consult-line-multi))
-  (eval-after org
-    (define-key org-mode-map (kbd "M-g o") #'consult-org-heading))
-  (eval-after consult-imenu
-    (setf (alist-get ?y (plist-get (alist-get 'emacs-lisp-mode
-                                              consult-imenu-config)
-                                   :types))
-          '("Yoke"))))
-
-(yoke (orderless "https://github.com/oantolin/orderless")
-  (require 'orderless)
-  (setf completion-styles '(substring orderless basic)
-        completion-category-defaults nil
-        completion-category-overrides
-        '((file (styles basic partial-completion)))
-        orderless-component-separator #'orderless-escapable-split-on-space))
-
-(yoke (vertico "https://github.com/minad/vertico")
-  (require 'vertico)
-  (setf resize-mini-windows 'grow-only
-        vertico-count-format nil
-        vertico-cycle t)
-  (vertico-mode)
-  (add-to-list 'load-path (expand-file-name "vertico/extensions" yoke-dir))
-  (require 'vertico-directory)
-  (add-hook 'rfn-eshadow-update-overlay-hook #'vertico-directory-tidy))
-
-(yoke (embark "https://github.com/oantolin/embark")
-  (require 'embark)
-  (setf prefix-help-command #'embark-prefix-help-command
-        embar-keymap-prompter-key ";")
-  (defkeys (t minibuffer-local-map)
-    "C-." #'embark-act
-    "M-." #'embark-dwim
-    "<f1> B" #'embark-bindings)
-  (define-key* embark-file-map
-               "l" #'vlf)
-  (eval-after (embark consult)
-    (require 'embark-consult)
-    (add-hook 'embark-collect-mode-hook #'consult-preview-at-point-mode)))
-
-(yoke (marginalia "https://github.com/minad/marginalia/")
-  (marginalia-mode))
+  (define-advice completing-read-multiple (:filter-args (args) indicator)
+    (cons (format "[CRM%s] %s"
+                  (replace-regexp-in-string
+                   "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
+                   crm-separator)
+                  (car args))
+          (cdr args)))
+  :bind 
+  (([remap switch-to-buffer] . consult-buffer)
+   ([remap switch-to-buffer-other-window] . consult-buffer-other-window)
+   ([remap switch-to-buffer-other-frame] . consult-buffer-other-frame)
+   ([remap yank-pop] . consult-yank-pop)
+   ("M-g g" . consult-goto-line)
+   ("M-g M-g" . consult-goto-line)
+   ("M-g i" . consult-imenu)
+   ("M-g M-i" . consult-imenu)
+   ("M-s l" . consult-line)
+   ("M-s f" . consult-find)
+   ("M-s M-f" . consult-find)
+   ("M-s g" . consult-grep)
+   ("M-s M-g" . consult-grep)))
+
+;;; General enhancements
+
+(use-package embark
+  :ensure t
+  :custom
+  (prefix-help-command #'embark-prefix-help-command)
+  :bind
+  (("C-." . embark-act)
+   ("M-." . embark-dwim)
+   ("C-h b" . embark-bindings))
+  :custom
+  (add-to-list 'display-buffer-alist
+               '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
+                 nil
+                 (window-parameters (mode-line-format . none)))))
+
+(use-package embark-consult
+  :ensure t
+  :after (embark consult)
+  :hook (embark-collect-mode-hook . consult-preview-at-point-mode))
+
+(use-package undo-fu-session
+  :ensure t
+  :custom
+  (undo-fu-session-directory (etc/ "undo/" t))
+  (undo-fu-session-incompatible-files
+   '("/COMMIT_EDITMSG\\'"
+     "/git-rebase-todo\\'"))
+  (undo-fu-session-compression
+   (cl-loop for (exe . sym) in '(("gzip" . gz)
+                                 ("bzip2" . bz2)
+                                 ("xz" . xz))
+            if (executable-find exe)
+            return sym))
+  :config
+  (global-undo-fu-session-mode))
 
-(yoke (wgrep "https://github.com/mhayashi1120/Emacs-wgrep")
-  (require 'wgrep)
-  (define-key* grep-mode-map
-               "C-x C-q" #'wgrep-change-to-wgrep-mode))
+(use-package ws-butler
+  :ensure t
+  :custom
+  (ws-butler-trim-predicate  (lambda (begin end)
+                               (not (eq 'font-lock-string-face
+                                        (get-text-property end 'face)))))
+  :config
+  (ws-butler-global-mode))
+
+(use-package minions
+  :ensure t
+  :config
+  (minions-mode))
 
-(yoke (slime "https://github.com/slime/slime")
-  :when (executable-find "sbcl")
-  (setc inferior-lisp-program (executable-find "sbcl"))
-  (defhook lisp-mode-hook
-    :name slime-mode-setup
-    (load (expand-file-name "~/quicklisp/slime-helper.el") :noerror)
-    (slime-mode))
-  (eval-after slime
-    (setc slime-completion-at-point-functions
-          (delq 'slime-c-p-c-completion-at-point
-                slime-completion-at-point-functions))))
-
-(yoke (puni "https://github.com/amaikinono/puni")
-  (electric-pair-mode)
-  (defkeys puni-mode-map
-    "C-)" #'puni-slurp-forward
-    "C-(" #'puni-slurp-backward
-    "C-}" #'puni-barf-forward
-    "C-{" #'puni-barf-backward
-    "M-(" (defun +puni-open-then-slurp-forward (&optional n)
-            (interactive "p")
-            (insert "()")
-            (backward-char)
-            (ignore-errors (puni-slurp-forward n))))
-  (defhook (prog-mode-hook
-            lisp-interaction-mode-hook emacs-lisp-mode-hook
-            lisp-mode-hook scheme-mode-hook
-            ielm-mode-hook eval-expression-minibuffer-setup-hook)
-    #'puni-mode))
-
-(yoke (hungry-delete "https://github.com/nflath/hungry-delete")
-  (setc hungry-delete-chars-to-skip " \t"
-        hungry-delete-join-reluctantly nil)
-  (eval-after hungry-delete
-    (add-to-list* 'hungry-delete-except-modes
-      #'eshell-mode
-      #'nim-mode
-      #'python-mode))
-  (defun +hungry-delete-or (hd-fn fn arg)
-    (funcall (if (looking-back (format "[%s]" hungry-delete-chars-to-skip) arg)
-                 hd-fn
-               fn)
-             arg))
-  (defkeys puni-mode-map
-    [remap puni-backward-delete-char]
-    (defun +puni|hungry-delete-backward (arg)
-      (interactive "p")
-      (+hungry-delete-or #'hungry-delete-backward
-                         #'puni-backward-delete-char
-                         arg))
-    [remap puni-forward-delete-char]
-    (defun +puni|hungry-delete-forward (arg)
-      (interactive "p")
-      (+hungry-delete-or #'hungry-delete-forward
-                         #'puni-forward-delete-char
-                         arg)))
-  (global-hungry-delete-mode))
+(use-package mode-line-bell
+  :vc ( :url "https://github.com/duckwork/mode-line-bell"
+        :rev "remap-face")
+  :custom
+  (mode-line-bell-flash-time 0.25)
+  :config
+  (mode-line-bell-mode))
+
+(use-package electric-cursor
+  :load-path "~/src/emacs/electric-cursor/"
+  :custom
+  (electric-cursor-alist '((overwrite-mode . box)
+                           (t . bar)))
+  (electric-cursor-mode))
 
-(yoke (cape "https://github.com/minad/cape")
-  ;; Insinuate in a lot of modes
-  (defvar +capes '(cape-file cape-dabbrev))
-  (defun +cape-insinuate (hook capf &optional capes)
-    "Insinuate CAPES into a HOOK along with CAPF function.
-CAPES defaults to `+capes'.  CAPF will be made un-exclusive."
-    (setq-local-hook hook
-      completion-at-point-functions
-      (apply #'list (cape-capf-properties capf :exclusive 'no)
-             (or capes +capes))))
-  (+cape-insinuate 'emacs-lisp-mode-hook #'elisp-completion-at-point))
-
-(yoke (minions "https://github.com/tarsius/minions")
-  (minions-mode))
+(use-package visual-fill-column
+  :ensure t
+  :custom
+  (visual-fill-column-center-text t)
+  :hook ((visual-fill-column-mode-hook . visual-line-mode)
+         (eww-mode-hook . visual-fill-column-mode))
+  :config
+  (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
 
-(yoke (magit "https://github.com/magit/magit"
-             :load "lisp")
-  :depends ((transient "https://github.com/magit/transient"
-                       :load "lisp")
-            (dash "https://github.com/magnars/dash.el")
-            (with-editor "https://github.com/magit/with-editor"
-              :load "lisp"))
-  (autoload #'transient--with-suspended-override "transient")
-  (autoload #'magit "magit" nil :interactive)
-  (defkeys t
-    "C-x g" #'magit))
+(use-package cape
+  :ensure t
+  :demand t
+  :init
+  (dolist (fn '(cape-file cape-dabbrev))
+    (add-hook 'completion-at-point-functions fn 90))
+  :config
+  (require '+cape)
+  (advice-add 'emacs-completion-at-point :around #'cape-wrap-nonexclusive)
+  (+cape-insinuate text-mode-hook ( cape-dict cape-ispell
+                                    cape-file cape-dabbrev)))
+
+(use-package wgrep
+  :ensure t
+  :custom
+  (wgrep-enable-key (kbd "C-x C-q"))
+  :bind (:map grep-mode-map
+              ("C-x C-q" . wgrep-change-to-wgrep-mode)))
+
+(progn
+  (use-package-statistics-gather :use-package 'mlscroll nil)
+  (use-package-ensure-elpa 'mlscroll
+                           '(t)
+                           'nil)
+  (use-package-statistics-gather :preface 'mlscroll nil)
+  (eval-and-compile
+    (defhook modus-themes-after-load-theme-hook :name modus-themes-load@mlscroll
+             (mlscroll-mode -1)
+             (when
+                 (or
+                  (memq 'modus-vivendi custom-enabled-themes)
+                  (memq 'modus-operandi custom-enabled-themes))
+               (modus-themes-with-colors
+                 (setf mlscroll-in-color fg-dim mlscroll-out-color bg-inactive)))
+             (eval-after 1
+               (mlscroll-mode 1))))
+  (defvar use-package--warning99
+    (function
+     (lambda
+       (keyword err)
+       (let
+           ((msg
+             (format "%s/%s: %s" 'mlscroll keyword
+                     (error-message-string err))))
+         (display-warning 'use-package msg :error)))))
+  (condition-case-unless-debug err
+      (progn
+        (use-package-statistics-gather :init 'mlscroll nil)
+        (condition-case-unless-debug err
+            (when
+                (daemonp)
+              (add-hook 'server-after-make-frame
+                        (function modus-themes-load@ml-scroll)))
+          (error
+           (funcall use-package--warning99 :init err)))
+        (run-with-idle-timer 1 nil
+                             (function require)
+                             'mlscroll nil t)
+        (eval-after-load 'mlscroll
+          '(progn
+             (use-package-statistics-gather :config 'mlscroll nil)
+             (let
+                 ((now
+                   (current-time)))
+               (message "%s..." "Configuring package mlscroll")
+               (prog1
+                   (condition-case-unless-debug err
+                       (progn
+                         (modus-themes-load@mlscroll)
+                         t)
+                     (error
+                      (funcall use-package--warning99 :config err)))
+                 (let
+                     ((elapsed
+                       (float-time
+                        (time-subtract
+                         (current-time)
+                         now))))
+                   (if
+                       (> elapsed 0.1)
+                       (message "%s...done (%.3fs)" "Configuring package mlscroll" elapsed)
+                     (message "%s...done" "Configuring package mlscroll")))))
+             (use-package-statistics-gather :config 'mlscroll t)))
+        (use-package-statistics-gather :init 'mlscroll t))
+    (error
+     (funcall use-package--warning99 :catch err)))
+  (use-package-statistics-gather :preface 'mlscroll t)
+  (use-package-statistics-gather :use-package 'mlscroll t))
+
+(use-package avy
+  :ensure t
+  :demand t
+  :custom
+  (avy-background t)
+  (avy-keys (string-to-list "asdfghjklqwertyuiopzxcvbnm"))
+  :bind (("M-j" . avy-goto-char-timer)
+         :map isearch-mode-map
+         ("M-j" . avy-isearch)))
+
+(use-package zzz-to-char
+  :ensure t
+  :bind (("M-z" . zzz-to-char)))
+
+;;; Searching
+
+(use-package isearch-mb
+  :ensure t
+  :custom
+  (isearch-lazy-count t)
+  (isearch-regexp-lax-whitespace t)
+  ;; Space matches whitespace, newlines, punctuation
+  (search-whitespace-regexp "\\W+")
+  (search-default-mode t "Search using regexp by default.")
+  ;; Space matches any sequence of characters in a line
+  ;; search-whitespace-regexp ".*?"
+  (isearch-wrap-pause 'no)
+  :config
+  (require '+isearch)
+  (advice-add 'isearch-cancel :before
+              #'+isearch-cancel@add-search-to-history)
+  (advice-add 'perform-replace :around
+              #'+perform-replace-dont-exit-on-anykey)
+  (eval-after (isearch-mb consult)
+    (add-to-list 'isearch-mb--after-exit #'consult-line)
+    (add-to-list 'isearch-mb--with-buffer #'consult-isearch-history)
+    (defkeys isearch-mb-minibuffer-map
+      "M-s l" #'consult-line
+      "M-r" #'consult-isearch-history))
+  (eval-after (isearch-mb anzu)
+    (add-to-list 'isearch-mb--after-exit #'anzu-isearch-query-replace)
+    (defkeys isearch-mb-minibuffer-map
+      "M-%" #'anzu-isearch-query-replace-regexp
+      "C-M-%" #'anzu-isearch-query-replace))
+  (isearch-mb-mode))
 
-(yoke (git-modes "https://github.com/magit/git-modes")
-  (require 'git-modes))
+(use-package anzu
+  :ensure t
+  :bind
+  (("M-%" . anzu-query-replace-regexp)
+   ("C-M-%" . anzu-query-replace)))
 
-(yoke (visual-fill-column "https://codeberg.org/joostkremers/visual-fill-column")
-  (setc visual-fill-column-center-text t)
-  (add-hook 'visual-fill-column-mode-hook #'visual-line-mode)
-  (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
+(use-package frowny
+  :load-path "~/src/emacs/frowny/"
+  :config
+  (global-frowny-mode))
 
-(yoke (org "https://git.savannah.gnu.org/git/emacs/org-mode.git"
-           :load "lisp")
-  :depends ((org-contrib "https://git.sr.ht/~bzg/org-contrib"
-                         :load "lisp"))
-  ;; DON'T load system org
-  (setc load-path
-        (cl-remove-if (lambda (path) (string-match-p "lisp/org\\'" path))
-                      load-path))
-  (setc org-adapt-indentation nil
-        org-auto-align-tags t
-        org-archive-mark-done t
-        org-fold-catch-invisible-edits 'show-and-error
-        org-clock-clocked-in-display 'mode-line
-        org-clock-frame-title-format (cons
-                                      '(t org-mode-line-string)
-                                      (cons " --- " frame-title-format))
-        org-clock-string-limit 7     ; just the clock bit
-        ;; org-clock-string-limit 25    ; gives enough information
-        org-clock-persist nil
-        org-confirm-babel-evaluate nil
-        org-cycle-separator-lines 0
-        org-directory (sync/ "org/" t)
-        org-ellipsis (or truncate-string-ellipsis "…")
-        org-fontify-done-headline t
-        org-fontify-quote-and-verse-blocks t
-        org-fontify-whole-heading-line t
-        org-hide-emphasis-markers t
-        org-html-coding-system 'utf-8-unix
-        org-image-actual-width (list (* (window-font-width)
-                                        (- fill-column 8)))
-        org-imenu-depth 3
-        org-indent-indentation-per-level 0
-        org-indent-mode-turns-on-hiding-stars nil
-        org-insert-heading-respect-content t
-        org-list-demote-modify-bullet '(("-" . "+")
-                                        ("+" . "-"))
-        org-log-done 'time
-        org-log-into-drawer t
-        org-num-skip-commented t
-        org-num-skip-unnumbered t
-        org-num-skip-footnotes t
-        org-outline-path-complete-in-steps nil
-        org-pretty-entities t
-        org-pretty-entities-include-sub-superscripts nil
-        org-refile-targets '((nil . (:maxlevel . 2))
-                             (org-agenda-files . (:maxlevel . 1)))
-        org-refile-use-outline-path 'file
-        org-special-ctrl-a/e t
-        org-special-ctrl-k t
-        org-src-fontify-natively t
-        org-src-tab-acts-natively t
-        org-src-window-setup 'current-window
-        org-startup-truncated nil
-        org-startup-with-inline-images t
-        org-tags-column -77 ;; (- (- fill-column 1 (length org-ellipsis)))
-        org-todo-keywords
-        '((sequence "TODO(t)" "WAIT(w@/!)" "ONGOING(o@)"
-                    "|" "DONE(d!)" "ASSIGNED(a@/!)")
-          (sequence "|" "CANCELED(k@)")
-          (sequence "MEETING(m)"))
-        org-use-speed-commands t
-        org-emphasis-alist '(("*" org-bold)
-                             ("/" org-italic)
-                             ("_" org-underline)
-                             ("=" org-verbatim)
-                             ("~" org-code)
-                             ("+" org-strikethrough)))
-  (defhook org-mode-hook
-    #'variable-pitch-mode
-    #'visual-fill-column-mode
-    #'turn-off-auto-fill
-    #'org-indent-mode
-    #'prettify-symbols-mode
-    #'abbrev-mode
-    (defhook ((before-save-hook nil :local))
-      :name before-save@org-mode
-      (+org-hide-drawers-except-point)
-      (org-align-tags 'all)))
-  (eval-after org
-    (require '+org)
-    (org-clock-persistence-insinuate)
-    (+org-agenda-inhibit-hooks-mode)
-    (defkeys org-mode-map
-      "C-M-k" #'kill-paragraph
-      "C-M-t" #'transpose-paragraphs
-      "RET" #'+org-return-dwim
-      "S-<return>" #'+org-table-copy-down|+org-return
-      "C-c C-o" #'+org-open-at-point-dwim))
-  (eval-after ol                        ; org-link
-    (defmacro define-org-link-type (type args &rest body)
-      "Define an org link TYPE with ARGS that does something.
-  If BODY is blank, message the user about the link."
-      (declare (indent 2) (doc-string 3) (debug (sexp sexp def-body)))
-      (let ((fn (intern (format "org-%s-open" type)))
-            (body (or body `((message ,(format "%s: %%S" type) ,(car args)))))
-            (type-string (format "%s" type)))
-        `(prog1
-             (defun ,fn ,args
-               ,@body)
-           (org-link-set-parameters ,type-string :follow #',fn))))
-    (define-org-link-type sms (number _))
-    (define-org-link-type tel (number _))))
-
-(yoke org-word-count ; in lisp/
-  (eval-after org
-    (require 'org-word-count)
-    (add-hook 'org-mode-hook #'org-word-count-mode)))
-
-(yoke org-agenda
-  (setq org-agenda-skip-deadline-if-done t
-        org-agenda-skip-scheduled-if-done t
-        org-agenda-span 10
-        org-agenda-block-separator ?─
-        org-agenda-time-grid
-        '((daily today require-timed)
-          (800 1000 1200 1400 1600 1800 2000)
-          " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄")
-        org-agenda-current-time-string
-        "← now ─────────────────────────────────────────────────"
-        org-agenda-include-diary nil ; I use the org-diary features
-        org-agenda-todo-ignore-deadlines 'near
-        org-agenda-todo-ignore-scheduled 'future
-        org-agenda-include-deadlines t
-        org-deadline-warning-days 0
-        org-agenda-show-future-repeats 'next
-        org-agenda-window-setup 'current-window
-        org-agenda-file-skip-regexp "sync-conflict")
-  (defcustom org-agenda-file-skip-regexp nil
-    "Files matching this regexp are removed from `org-agenda-files'."
-    :group 'org-agenda)
-  (define-advice org-agenda-files (:filter-return (files) skip-regexp)
-    (when org-agenda-file-skip-regexp
-      (setq files (seq-remove (lambda (file)
-                                (string-match-p org-agenda-file-skip-regexp
-                                                file))
-                              files)))
-    files)
-  (setq-local-hook org-agenda-mode-hook
-    truncate-lines t)
-  (add-hook 'org-agenda-mode-hook #'hl-line-mode)
-  (add-hook 'org-agenda-after-show-hook #'org-narrow-to-subtree)
+(use-package transpose-frame
+  :ensure t
+  :bind
+  (("C-x 5 t" . transpose-frame)))
+
+;;; Text editing
+
+(use-package org
+  :defer t
+  :after derived
+  :init
+  (require 'init-org)
+  (require '_work))
+
+(use-package ispell
+  :custom
+  (ispell-program-name (choose-executable "ispell" "aspell"))
+  :config
+  (require '+ispell)
+  (add-hook 'before-save-hook
+            #'+ispell-move-buffer-words-to-dir-locals-hook)
+  (put 'ispell-buffer-session-localwords 'safe-local-variable
+       #'+ispell-safe-local-p))
+
+(use-package flyspell
+  :hook org-mode-hook)
+
+(use-package flyspell-correct
+  :ensure t
+  :after flyspell
+  :custom
+  (flyspell-correct--cr-key ";")
+  :bind
+  (:map flyspell-mode-map
+        (("C-;" . flyspell-correct-wrapper)
+         ("<f7>" . +flyspell-correct-buffer)))
+  :config
+  (require '+flyspell-correct)
+  (defkeys flyspell-mode-map
+    "C-," nil
+    "C-." nil))
+
+(use-package text-mode
+  :config
+  (defhook text-mode-hook
+    #'abbrev-mode))
+
+(use-package filldent
+  :load-path "~/src/emacs/filldent/"
+  :bind
+  ("M-q" . filldent-dwim))
+
+(use-package scule
+  :load-path "~/src/emacs/scule/"
+  :config
   (defkeys t
-    "C-c c" #'org-capture
-    "C-c a" #'org-agenda)
-  (eval-after org-capture
-    (require '+org-capture)))
-
-(yoke ox                                ; org-export
-  (eval-after org (require 'ox))
-  (eval-after ox
-    (require* '+ox '(ox-md nil t))
-    (+org-export-pre-hooks-insinuate))
-  (setq org-export-coding-system 'utf-8-unix
-        org-export-headline-levels 8
-        org-export-with-drawers nil
-        org-export-with-section-numbers nil
-        org-export-with-smart-quotes t
-        org-export-with-sub-superscripts t
-        org-export-with-toc nil))
-
-(yoke (electric-cursor "https://codeberg.org/acdw/electric-cursor.el")
-  (setq electric-cursor-alist '((overwrite-mode . hbar)
-                                (t . bar)))
-  (electric-cursor-mode))
+    "M-c" (defmap scule-map
+            "Keymap for twiddling scules."
+            "M-u" #'scule-upcase
+            "M-l" #'scule-downcase
+            "M-c" #'scule-capitalize)))
+
+(use-package titlecase
+  :load-path "~/src/emacs/titlecase.el/"
+  :after org
+  :bind (:map scule-map
+              ("M-t" . titlecase-dwim))
+  :config
+  (require '+titlecase))
+
+;;; Programming
+
+(use-package prog-mode
+  :config
+  (defhook prog-mode-hook
+    #'auto-fill-mode
+    ;; Use `indent-tabs-mode' unless one of the following modes
+    (indent-tabs-mode (if (derived-mode-p 'emacs-lisp-mode
+                                          'python-mode
+                                          'haskell-mode)
+                          -1 1))))
+
+(use-package paredit
+  :ensure t
+  :preface
+  (defun +paredit-newline ()
+    (interactive)
+    (call-interactively
+     (if (derived-mode-p 'lisp-interaction-mode)
+         #'eval-print-last-sexp
+       #'paredit-newline)))
+  :hook ((emacs-lisp-mode-hook
+          eval-expression-minibuffer-setup-hook
+          ielm-mode-hook lisp-interaction-mode-hook
+          lisp-mode-hook scheme-mode-hook
+          fennel-repl-mode-hook fennel-mode-hook
+          geiser-mode-hook geiser-repl-mode-hook
+          ielm-mode-hook)
+         . enable-paredit-mode)
+  :bind
+  (("C-j" . +paredit-newline))
+  :config
+  (defkeys paredit-mode-map
+    "RET" nil
+    "M-s" nil)
+  (require '+paredit)
+  (add-to-list 'paredit-space-for-delimiter-predicates
+               #'+paredit-space-for-delimiter)
+  (eval-after (paredit eldoc)
+    (eldoc-add-command #'paredit-backward-delete #'paredit-close-round)))
+
+(use-package hungry-delete
+  :ensure t
+  :custom
+  (hungry-delete-chars-to-skip " \t")
+  (hungry-delete-join-reluctantly nil)
+  :config
+  (dolist (m '(eshell-mode
+               nim-mode
+               python-mode))
+    (add-to-list 'hungry-delete-except-modes m))
+  (require '+hungry-delete)
+  (eval-after paredit
+    (defkeys paredit-mode-map
+      [remap paredit-backward-delete]
+      (+hungry-delete-define-alternative
+       paredit-backward-delete hungry-delete-backward)
+      [remap paredit-forward-delete]
+      (+hungry-delete-define-alternative
+       paredit-forward-delete hungry-delete-forward)))
+  (global-hungry-delete-mode))
 
-(yoke _work
-  :depends ((bbdb "https://git.savannah.nongnu.org/git/bbdb.git"
-                  :load "lisp")
-            (bbdb-vcard "https://github.com/tohojo/bbdb-vcard/"))
-  (setf bbdb-complete-mail-allow-cycling t
-        bbdb-file (private/ "bbdb"))
-  (defhook +custom-after-load-hook
-    :name _work@after-custom
-    (require* 'private '_work)
-    (require* 'bbdb 'bbdb-message)
-    (bbdb-initialize 'gnus 'message)))
-
-(yoke (org-taskwise "https://codeberg.org/acdw/org-taskwise.el"))
-
-(yoke scule
-  (require 'scule)
-  (defvar scule-map (let ((map (make-sparse-keymap)))
-                      (define-key map (kbd "M-u") #'scule-upcase)
-                      (define-key map (kbd "M-l") #'scule-downcase)
-                      (define-key map (kbd "M-c") #'scule-capitalize)
-                      map)
-    "Keymap for scule twiddling.")
-  (define-key* (current-global-map)
-               "M-c" scule-map
-               "M-u" #'universal-argument)
-  (define-key universal-argument-map (kbd "M-u") #'universal-argument-more))
-
-(yoke (titlecase "https://codeberg.org/acdw/titlecase.el")
-  (eval-after titlecase
-    (add-to-list* 'titlecase-skip-words-regexps
-      (rx word-boundary
-          (+ (any upper digit))
-          word-boundary)))
-  (eval-after scule
-    (define-key* scule-map
-                 "M-t" #'titlecase-dwim)))
-
-(yoke (flyspell-correct "https://github.com/duckwork/flyspell-correct")
-  (eval-after flyspell
-    (require* 'flyspell-correct
-              `(+flyspell-correct ,(locate-user-emacs-file "lisp/+flyspell-correct")))
-    (define-key* flyspell-mode-map
-                 "C-;" #'flyspell-correct-wrapper
-                 "<f7>" #'+flyspell-correct-buffer
-                 "C-," nil
-                 "C-." nil))
-  (add-hook 'org-mode-hook #'flyspell-mode)
-  (setq flyspell-correct--cr-key ";"))
-
-(yoke (helpful "https://github.com/Wilfred/helpful")
-  :depends ((dash "https://github.com/magnars/dash.el")
-            (f "https://github.com/rejeep/f.el")
-            (s "https://github.com/magnars/s.el")
-            (elisp-refs "https://github.com/Wilfred/elisp-refs"))
-  (defkeys t
-    "<f1> f" #'helpful-callable
-    "<f1> v" #'helpful-variable
-    "<f1> k" #'helpful-key
-    "<f1> ." #'helpful-at-point
-    "<f1> o" #'helpful-symbol)
-  (unless (featurep 'info-look)
-    (run-with-idle-timer 5 nil (lambda ()
-                                 (require 'info-look)
-                                 (let ((inhibit-message t))
-                                   (info-lookup-setup-mode 'symbol
-                                                           'emacs-lisp-mode)))))
-  (defhook window-configuration-change-hook
-    :name side-window-setup
-    (setf fit-window-to-buffer-horizontally t
-          (alist-get (rx (or "*helpful" "*Help" "*info"))
-                     display-buffer-alist nil nil #'string=)
-          `(display-buffer-in-side-window
-            ,@(if (< (frame-text-width) (frame-text-height))
-                  '((side . bottom) (window-height . 24))
-                '((side . right) (window-width . fit-window-to-buffer)))))))
-
-(yoke (hippie-completing-read
-       "https://codeberg.org/acdw/hippie-completing-read.el")
-  (define-key* (current-global-map)
-               "M-/" #'hippie-completing-read))
-
-(yoke dictionary                        ; Comes with Emacs 29!
-  (defkeys (t (org-mode-map :after org))
-    "C-c d" #'dictionary-search)
-  (defkeys ((embark-identifier-map :after embark))
-    "@" #'dictionary-search)
-  (setc dictionary-server (if (or (executable-find "dictd")
-                                  (file-exists-p "/usr/sbin/dictd")) ; oh debian
-                              "localhost"
-                            "dict.org"))
-  (setf (alist-get "^\\*Dictionary\\*" display-buffer-alist nil nil #'string=)
-        '((display-buffer-in-side-window)
-          (side . bottom)
-          (window-height . 20))))
-
-(yoke (anzu "https://github.com/emacsorphanage/anzu")
-  (require 'anzu)
-  (global-anzu-mode)
-  (defkeys t
-    [remap query-replace] #'anzu-query-replace-regexp
-    [remap query-replace-regexp] #'anzu-query-replace)
-  (defkeys (isearch-mode-map (isearch-mb-minibuffer-map :after isearch-mb))
-    [remap isearch-query-replace] #'anzu-isearch-query-replace-regexp
-    [remap isearch-query-replace-regexp] #'anzu-isearch-query-replace)
-  (defun anzu-qr@window (fn &rest r)
-    "ADVICE to query-replace from the beginning of the window."
-    (let ((scroll-margin 0))
-      (cond ((region-active-p)
-             (apply fn r))
-            (:else (save-excursion
-                     (goto-char (window-start))
-                     (apply fn r))))))
-  (advice-add 'anzu-query-replace-regexp :around #'anzu-qr@window)
-  (advice-add 'anzu-query-replace :around #'anzu-qr@window))
-
-(yoke tempo
-  (require '+tempo))
-
-(yoke (0x0 "https://gitlab.com/willvaughn/emacs-0x0")
-  (setf 0x0-default-server 'ttm)
-  (define-advice 0x0-shorten-uri (:around (fn server uri) use-0x0)
-    (interactive (list (cdr (assq 'envs 0x0-servers))
-                       (read-string "URI: ")))
-    (funcall fn server uri))
-  (eval-after embark
-    (define-key* embark-region-map
-                 "U" #'0x0-dwim)))
-
-(yoke (filldent "https://codeberg.org/acdw/filldent.el")
-  (define-advice canonically-space-region (:around (orig &rest r) double-space)
-    (let ((sentence-end-double-space t))
-      (apply orig r)))
-  (defkeys t
-    "M-q" #'filldent-unfill-toggle))
-
-(yoke (avy "https://github.com/abo-abo/avy")
-  (require 'avy)
-  (setf avy-background t
-        (alist-get ?. avy-dispatch-alist)
-        (defun avy-action-embark (pt)
-          (unwind-protect
-              (save-excursion
-                (goto-char pt)
-                (embark-act))
-            (select-window
-             (cdr (ring-ref avy-ring 0))))
-          t))
-  (define-key* (current-global-map)
-               "M-j" #'avy-goto-char-timer)
-  (define-key* isearch-mode-map
-               "M-j" #'avy-isearch))
-
-(yoke (frowny "https://codeberg.org/acdw/frowny.el")
-  (setf frowny-eyes (rx (any ":=") (opt "'") (? "-")))
-  (global-frowny-mode))
+(use-package ediff
+  :custom
+  (ediff-keep-variants nil)
+  (ediff-split-window-function #'split-window-horizontally)
+  (ediff-window-setup-function #'ediff-setup-windows-plain))
 
-(yoke (isearch-mb "https://github.com/astoff/isearch-mb")
-  (eval-after (consult anzu)
-    (require 'isearch-mb)
-    (dolist (spec '((isearch-mb--with-buffer
-                     ("M-e" .  consult-isearch)
-                     ("C-o" . loccur-isearch))
-                    (isearch-mb--after-exit
-                     ("M-%" . anzu-isearch-query-replace)
-                     ("M-s l" . consult-line))))
-      (let ((isearch-mb-list (car spec))
-            (isearch-mb-binds (cdr spec)))
-        (dolist (cell isearch-mb-binds)
-          (let ((key (car cell))
-                (command (cdr cell)))
-            (when (fboundp command)
-              (add-to-list isearch-mb-list command)
-              (define-key isearch-mb-minibuffer-map (kbd key) command)))))))
-  (isearch-mb-mode))
+;;; Lisps
 
-(yoke (keepassxc-shim "https://codeberg.org/acdw/keepassxc-shim.el")
+(use-package elisp-mode
+  :custom
+  (eval-expression-print-length nil)
+  (eval-expression-print-level nil)
+  :preface
+  (defun elisp-eval-region|eval-buffer ()
+    (interactive)
+    (if (region-active-p)
+        (let ((start (region-beginning))
+              (end (region-end)))
+          (eval-region start end)
+          (message "Region from %s to %s evaluated."
+                   start end))
+      (eval-buffer)
+      (message "Buffer `%s' evaluated." (buffer-name))))
+  (defkeys (emacs-lisp-mode-map lisp-interaction-mode-map)
+    "C-c C-c" #'eval-defun
+    "C-c C-k" #'elisp-eval-region|eval-buffer
+    "C-c C-z" #'ielm)
+  :config
+  (define-advice eval-region (:around (orig start end &rest args) pulse)
+    (apply orig start end args)
+    (pulse-momentary-highlight-region start end))
+  (defhook emacs-lisp-mode-hook
+    (setq-local page-delimiter "^\\(\\|;;;+\\).*")))
+
+(use-package macrostep
+  :ensure t
+  :after elisp-mode
+  :bind ( :map emacs-lisp-mode-map
+          ("C-c e" . macrostep-expand)
+          :map lisp-interaction-mode-map
+          ("C-c e" . macrostep-expand)))
+
+(use-package eros
+  :ensure t
+  :after elisp-mode
+  :custom (eros-eval-result-prefix "; ")
+  :hook emacs-lisp-mode-hook)
+
+(use-package package-lint
+  :ensure t)
+
+(use-package sly
+  :ensure t
+  :when (executable-find "sbcl")
+  :custom
+  (inferior-lisp-program (executable-find "sbcl"))
+  (sly-net-coding-system 'utf-8-unix)
+  :bind (:map sly-mode-map
+              (("C-c C-z" . sly-mrepl)))
+  :config
+  (sly-symbol-completion-mode -1))
+
+(use-package edebug
+  :preface
+  (defun turn-off-eldoc-mode ()
+    (eldoc-mode -1))
+  :config
+  (add-hook 'edebug-mode-hook #'turn-off-eldoc-mode))
+
+;;; Web languages
+
+(use-package web-mode
+  :ensure t
+  :mode ("\\.phtml\\'"
+         "\\.tpl\\.php\\'"
+         "\\.[agj]sp\\'"
+         "\\.as[cp]x\\'"
+         "\\.erb\\'"
+         "\\.mustache\\'"
+         "\\.djhtml\\'"
+         "\\.html?\\'"))
+
+;;; Applications
+
+(use-package dired
+  :init (require 'dired-x)
+  :custom
+  (dired-recursive-copies 'always)
+  (dired-recursive-deletes 'always)
+  (dired-create-destination-dirs 'always)
+  (dired-do-revert-buffer t)
+  (dired-hide-details-hide-symlink-targets nil)
+  (dired-isearch-filenames 'dwim)
+  (delete-by-moving-to-trash t)
+  (dired-auto-revert-buffer t)
+  (dired-listing-switches "-AlF")
+  (ls-lisp-dirs-first t)
+  (dired-ls-F-marks-symlinks t)
+  (dired-clean-confirm-killing-deleted-buffers nil)
+  (dired-no-confirm '(byte-compile
+                      load chgrp chmod chown
+                      copy move hardlink symlink
+                      shell touch))
+  (dired-dwim-target t)
+  :bind
+  (("C-x C-j" . dired-jump)
+   ([remap list-directory] . dired)
+   :map dired-mode-map
+   ("C-j" . dired-up-directory)
+   ("<backspace>" . dired-up-directory))
+  :init
+  (defhook dired-mode-hook
+    #'dired-hide-details-mode
+    #'hl-line-mode
+    #'truncate-lines-local-mode))
+
+(use-package dired-subtree
+  :ensure t
+  :after dired
+  :bind (:map dired-mode-map
+              (("TAB" . dired-subtree-cycle)
+               ("i" . dired-subtree-toggle))))
+
+(use-package dired-collapse
+  :ensure t
+  :hook dired-mode-hook)
+
+(use-package dired-hide-dotfiles
+  :ensure t
+  :bind (:map dired-mode-map
+              ("." . dired-hide-dotfiles-mode)))
+
+(use-package magit
+  :ensure t
+  :bind
+  ("C-x g" . magit))
+
+(use-package auth-source
+  :custom
+  (auth-sources '(default "secrets:passwords"))
+  :config
+  (defhook authinfo-mode-hook
+    #'truncate-lines-local-mode))
+
+(use-package keychain-environment
+  :ensure t
+  :when (executable-find "keychain")
+  :hook (after-init-hook . keychain-refresh-environment))
+
+(use-package keepassxc-shim
+  :load-path "~/src/emacs/keepassxc-shim/"
+  :config
   (keepassxc-shim-activate))
 
-(yoke (keychain-environment "https://github.com/tarsius/keychain-environment")
-  :when (executable-find "keychain")
-  (keychain-refresh-environment))
-
-(yoke (exec-path-from-shell "https://github.com/purcell/exec-path-from-shell")
-  :when (eq system-type 'gnu/linux)
-  (require 'exec-path-from-shell)
-  (dolist (var '("SSH_AUTH_SOCK"
-                 "SSH_AGENT_PID"
-                 "GPG_AGENT_INFO"
-                 "LANG"
-                 "LC_CTYPE"
-                 "XDG_CONFIG_HOME"
-                 "XDG_CONFIG_DIRS"
-                 "XDG_DATA_HOME"
-                 "XDG_DATA_DIRS"
-                 "XDG_CACHE_HOME"))
-    (add-to-list 'exec-path-from-shell-variables var))
-  (exec-path-from-shell-initialize))
-
-(yoke (sophomore "https://codeberg.org/acdw/sophomore.el")
-  (sophomore-enable-all)
-  (sophomore-disable #'view-hello-file
-                     #'describe-gnu-project)
-  (sophomore-disable-with 'confirm #'save-buffers-kill-terminal))
-
-(yoke (macrostep "https://github.com/joddie/macrostep")
-  (eval-after elisp-mode (require 'macrostep))
-  (define-key* '(emacs-lisp-mode-map
-                 lisp-interaction-mode-map)
-               "C-c e" #'macrostep-expand))
-
-(yoke (expand-region "https://github.com/magnars/expand-region.el")
-  (define-advice er/clear-history (:after (&rest _) refold-org)
-    (when (derived-mode-p 'org-mode)
-      (+org-hide-drawers-except-point)
-      (org-link-descriptive-ensure)
-      (font-lock-update)))
-  (defkeys t
-    "C-=" #'er/expand-region))
+(use-package eat
+  :ensure t
+  :commands eat-eshell-mode
+  :hook (eshell-load-hook . eat-eshell-mode))
+
+(use-package dictionary
+  :custom
+  (dictionary-server (if (or (executable-find "dictd")
+                             (file-exists-p "/usr/sbin/dictd")) ; debian
+                         "localhost"
+                       "dict.org"))
+  :bind
+  (("C-c d" . dictionary-search)))
+
+(use-package pdf-tools
+  :ensure t
+  :mode ("\\.[pP][dD][fF]\\'" . pdf-view-mode)
+  :magic ("%PDF" . pdf-view-mode)
+  :config
+  (pdf-tools-install))
 
-(yoke (embrace "https://github.com/cute-jumper/embrace.el")
-  :depends ((expand-region "https://github.com/magnars/expand-region.el"))
-  (defkeys t
-    "C-\"" #'embrace-commander)
-  (dolist (fnhook '((org-mode-hook embrace-org-mode-hook)
-                    (ruby-mode-hook embrace-ruby-mode-hook)
-                    (emacs-lisp-mode-hook embrace-emacs-lisp-mode-hook)
-                    (latex-mode-hook embrace-LaTeX-mode-hook)))
-    (apply #'add-hook fnhook))
-  (eval-after org
-    (defkeys org-mode-map
-      "C-\"" #'embrace-commander)
-    (defmacro org-insert-or-embrace (char)
-      "Define a function to insert CHAR, or `embrace' the region with it."
-      (let* ((fn-name (intern (format "org-insert-or-embrace-%s" char)))
-             (char (cond ((characterp char) char)
-                         ((stringp char) (string-to-char char))
-                         (t (user-error "Bad format for char: %S" char)))))
-        `(defun ,fn-name (n)
-           ,(format "Insert N %ss, or surround the region with them."
-                    (char-to-string char))
-           (interactive "p")
-           (if (region-active-p)
-               (dotimes (_ n)
-                 (embrace--add-internal (region-beginning) (region-end) ,char)
-                 (forward-char 1))
-             (self-insert-command n ,char)))))
-    (define-key* org-mode-map
-                 "*" (org-insert-or-embrace "*")
-                 "/" (org-insert-or-embrace "/")
-                 "_" (org-insert-or-embrace "_")
-                 "=" (org-insert-or-embrace "=")
-                 "~" (org-insert-or-embrace "~")
-                 "+" (org-insert-or-embrace "+"))))
-
-(yoke (notmuch "~/usr/share/emacs/site-lisp")
-  (eval-after bbdb
-    (require* 'notmuch '+notmuch '+message))
-  (+define-dir notmuch/ (sync/ "emacs/notmuch")
-    "Notmuch configuration and data.")
-  (setf notmuch-init-file (notmuch/ "notmuch-init.el" t)
-        notmuch-address-save-filename (notmuch/ "addresses" t)
-        notmuch-address-use-company (featurep 'company)
-        notmuch-search-oldest-first nil
-        notmuch-archive-tags '("-inbox" "-unread")
-        notmuch-draft-tags '("+draft" "-inbox" "-unread")
-        mail-user-agent 'notmuch-user-agent
-        bbdb-mail-user-agent 'notmuch-user-agent
-        message-mail-user-agent t)
-  (define-key* (current-global-map)
-               "C-c m" #'notmuch-mua-new-mail
-               "C-c n" #'+notmuch-goto)
-  ;; Reading mail
-  (setf notmuch-show-indent-content nil)
-  (add-hook* '(notmuch-show-mode-hook
-               notmuch-message-mode-hook)
+;;; Mail
+
+(use-package bbdb
+  :ensure t
+  :custom
+  (bbdb-complete-mail-allow-cycling t)
+  (bbdb-file (private/ "bbdb"))
+  :init
+  (defhook custom-allowed-after-load-hook
+    :name bbdb@after-custom
+    (require 'bbdb)
+    (require 'bbdb-message)
+    (bbdb-initialize 'message)))
+
+(use-package bbdb-vcard
+  :ensure t)
+
+(use-package notmuch
+  :load-path "~/usr/share/emacs/site-lisp/"
+  :preface
+  (defdir notmuch/ (sync/ "emacs/notmuch"))
+  :init
+  (use-package +notmuch
+    :after notmuch
+    :load-path "lisp/"
+    :bind (("C-c n" . +notmuch-goto)
+           :map notmuch-search-mode-map
+           ("!" . +notmuch-search-mark-spam)
+           :map notmuch-tree-mode-map
+           ("!" . +notmuch-search-mark-spam-then-next)
+           ("M-<" . +notmuch-tree-beginning)
+           ("M->" . +notmuch-tree-end))
+    :hook (message-send-hook . +send-mail-dispatch)
+    :config
+    ;; Saved searches
+    (+notmuch-make-saved-search "inbox+unread" "m" 'tree "tag:inbox" "tag:unread" "NOT tag:Spam")
+    (+notmuch-make-saved-search "inbox" "i" 'tree "tag:inbox" "NOT tag:Spam")
+    (+notmuch-make-saved-search "lists+unread" "l" 'tree "tag:/List/" "tag:unread")
+    (+notmuch-make-saved-search "lists" "L" 'tree "tag:/List/")
+    (+notmuch-make-saved-search "unread" "u" 'tree "tag:unread" "NOT tag:Spam")
+    (+notmuch-make-saved-search "flagged" "f" 'tree "tag:flagged")
+    (+notmuch-make-saved-search "sent" "t" 'tree "tag:sent")
+    (+notmuch-make-saved-search "drafts" "d" 'tree "tag:draft")
+    (+notmuch-make-saved-search "all mail" "a" 'tree "*"))
+  (use-package message
+    :after notmuch
+    :hook (message-setup-hook . message-signature-setup)
+    :config (require '+message))
+  (defhook (notmuch-show-mode-hook notmuch-message-mode-hook)
     #'visual-fill-column-mode)
-  (eval-after notmuch
-    (define-key* notmuch-search-mode-map
-                 "RET" #'notmuch-search-show-thread
-                 "M-RET" #'notmuch-tree-from-search-thread
-                 "!" #'+notmuch-search-mark-spam)
-    (define-key* notmuch-tree-mode-map
-                 "!" #'+notmuch-search-mark-spam-then-next
-                 "M-<" (notmuch-tree--define-do-in-message-window
-                        notmuch-tree-beginning-of-message beginning-of-buffer)
-                 "M->" (notmuch-tree--define-do-in-message-window
-                        notmuch-tree-end-of-message end-of-buffer)))
-  ;; Writing mail
-  (setf message-kill-buffer-on-exit t
-        message-auto-save-directory nil)
-  ;; Sending mail
-  (setf send-mail-function #'sendmail-send-it
-        mail-specify-envelope-from t
-        message-sendmail-envelope-from 'header
-        message-envelope-from 'header)
-  ;; Extras
-  (define-advice mm-save-part-to-file (:before (_handle file) create-directory)
-    (let ((directory (file-name-directory file)))
-      (when (yes-or-no-p (format "Directory %s doesn't exist.  Create?" directory))
-        (make-directory directory :parents))))
-  (eval-after notmuch
-    (require '+notmuch)
-    (load notmuch-init-file :noerror)
-    (add-hook 'message-setup-hook #'+message-signature-setup)
-    (add-hook 'message-send-hook #'+send-mail-dispatch)
-    (advice-add 'notmuch-tag :filter-args #'+notmuch-correct-tags)
-    (advice-add 'notmuch-bury-or-kill-this-buffer :after
-                (defun +display-time@notmuch (&rest _)
-                  ;; (display-time-event-handler)
-                  (setq display-time-mail-string
-                        (replace-regexp-in-string "(.*)"
-                                                  (format "(%s)" (+notmuch-new-mail-p))
-                                                  display-time-mail-string))
-                  (display-time-update)
-                  (force-mode-line-update)))
-    (add-to-list 'notmuch-message-headers "List-Post" :append)
-    (define-advice notmuch-mua-new-reply (:around (orig &rest r) list-aware)
-      "Make `notmuch-mua-new-reply' list-aware."
-      (let ((ml (notmuch-show-get-header :List-Post)))
-        (apply orig r)
-        (when ml
-          (with-buffer-modified-unmodified
-           (message-remove-header "To")
-           (message-add-header
-            (format "To: %s"
-                    (replace-regexp-in-string "<mailto:\\(.*\\)>" "\\1" ml)))
-           (message-goto-body)))))
-    (setf notmuch-saved-searches (list
-                                  (list :name "inbox+unread"
-                                        :query (+notmuch-query-concat
-                                                "tag:inbox"
-                                                "tag:unread"
-                                                "NOT tag:Spam")
-                                        :key "m"
-                                        :search-type 'tree)
-                                  (list :name "inbox"
-                                        :query (+notmuch-query-concat
-                                                "tag:inbox"
-                                                "NOT tag:Spam")
-                                        :key "i"
-                                        :search-type 'tree)
-                                  (list :name "lists+unread"
-                                        :query (+notmuch-query-concat
-                                                "tag:/List/"
-                                                "tag:unread")
-                                        :key "l"
-                                        :search-type 'tree)
-                                  (list :name "lists"
-                                        :query "tag:/List/"
-                                        :key "L"
-                                        :search-type 'tree)
-                                  (list :name "unread"
-                                        :query (+notmuch-query-concat
-                                                "tag:unread"
-                                                "NOT tag:Spam")
-                                        :key "u"
-                                        :search-type 'tree)
-                                  (list :name "flagged"
-                                        :query "tag:flagged"
-                                        :key "f"
-                                        :search-type 'tree)
-                                  (list :name "sent"
-                                        :query "tag:sent"
-                                        :key "t"
-                                        :search-type 'tree)
-                                  (list :name "drafts"
-                                        :query "tag:draft"
-                                        :key "d"
-                                        :search-type 'tree)
-                                  (list :name "all mail"
-                                        :query "*"
-                                        :key "a"
-                                        :search-type 'tree)))))
-
-(yoke (cider "https://github.com/clojure-emacs/cider")
-  :depends ((clojure-mode "http://github.com/clojure-emacs/clojure-mode")
-            (parseedn "https://github.com/clojure-emacs/parseedn/")
-            (parseclj "https://github.com/clojure-emacs/parseclj/") ; parseedn
-            (queue "https://elpa.gnu.org/packages/queue-0.2.el" :type 'http)
-            (spinner "https://github.com/Malabarba/spinner.el")
-            (sesman "https://github.com/vspinu/sesman"))
-  :when (executable-find "clojure"))
-
-(yoke (web-mode "https://github.com/fxbois/web-mode")
-  (setf (alist-get (rx "." (or "htm" "html" "phtml" "tpl.php"
-                               "asp" "gsp" "jsp" "ascx" "aspx"
-                               "erb" "mustache" "djhtml")
-                       eos)
-                   auto-mode-alist nil nil #'string=)
-        'web-mode))
-
-(yoke (chicken-geiser "https://gitlab.com/emacs-geiser/chicken")
-  :depends ((geiser "https://gitlab.com/emacs-geiser/geiser"
-                    :load "elisp"))
-  :when (executable-find "csi")
-  :pre ((autoload 'geiser-activate-implementation "geiser-impl"))
-  (autoload 'geiser "geiser" nil :interactive)
-  (add-hook 'scheme-mode-hook 'geiser-mode))
-
-(yoke (zoom-frm "https://github.com/emacsmirror/zoom-frm")
-  :depends ((frame-cmds "https://github.com/emacsmirror/frame-cmds")
-            (frame-fns "https://github.com/emacsmirror/frame-fns"))
-  (define-key* (current-global-map)
-               "M-+" #'zoom-frm-in
-               "M-_" #'zoom-frm-out))
-
-(yoke (jabber "https://codeberg.org/acdw/emacs-jabber")
-  :depends ((srv "https://github.com/legoscia/srv.el")
-            (fsm "https://elpa.gnu.org/packages/fsm-0.2.1.el" :type 'http))
-  (setf jabber-account-list '(("acdw@hmm.st"))
-        jabber-auto-reconnect t
-        jabber-chat-buffer-format "xmpp:%n"
-        jabber-browse-buffer-format "xmpp-browse:%n"
-        jabber-groupchat-buffer-format "xmpp-muc:%n"
-        jabber-muc-private-buffer-format "xmpp-muc-private:%n"
-        jabber-groupchat-prompt-format "%>10n │ "
-        jabber-chat-local-prompt-format "%>10n │ "
-        jabber-chat-system-prompt-format " * * * * * *"
-        jabber-chat-foreign-prompt-format "%>10n │ "
-        jabber-muc-private-foreign-prompt-format "%g/%n "
-        jabber-last-read-marker  "----------------------------------------"
-        jabber-muc-header-line-format '("" jabber-muc-topic)
-        jabber-muc-decorate-presence-patterns
-        '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$")
-          ("." . jabber-muc-presence-dim))
-        jabber-activity-make-strings
-        #'jabber-activity-make-strings-shorten
-        ;; (defun +jabber-activity-make-strings (jids)
-        ;;   (mapcar (lambda (jid)
-        ;;             (cons jid
-        ;;                   (let ((s (jabber-activity-make-string-default jid)))
-        ;;                     (cond
-        ;;                      ((string-match-p "%" s)
-        ;;                       (replace-regexp-in-string "%.*" "" s))
-        ;;                      (:else s)))))
-        ;;           jids))
-        jabber-rare-time-format " - - - - - - %H:%M %F")
+  :custom
+  (notmuch-init-file (notmuch/ "notmuch-init.el" t))
+  (notmuch-address-save-filename (notmuch/ "addresses" t))
+  (notmuch-address-use-company (featurep 'company))
+  (notmuch-search-oldest-first nil)
+  (notmuch-archive-tags '("-inbox" "-unread"))
+  (notmuch-draft-tags '("+draft" "-inbox" "-unread"))
+  (mail-user-agent 'notmuch-user-agent)
+  (bbdb-mail-user-agent 'notmuch-user-agent)
+  (message-mail-user-agent t)
+  (notmuch-show-indent-content nil)
+  (message-kill-buffer-on-exit t)
+  (message-auto-save-directory nil)
+  (send-mail-function #'sendmail-send-it)
+  (mail-specify-envelope-from t)
+  (message-sendmail-envelope-from 'header)
+  (message-envelope-from 'header)
+  (notmuch-saved-searches nil)
+  :bind
+  (("C-c m" . notmuch-mua-new-mail)
+   :map notmuch-search-mode-map
+   ("RET" . notmuch-search-show-thread)
+   ("M-RET" . notmuch-tree-from-search-thread))
+  :config
+  (load notmuch-init-file :noerror)
+  (advice-add 'notmuch-tag :filter-args #'+notmuch-correct-tags)
+  ;; Mailing lists
+  (add-to-list 'notmuch-message-headers "List-Post" :append)
+  (define-advice notmuch-mua-new-reply (:around (orig &rest r) list-aware)
+    "Make `notmuch-mua-new-reply' list-aware."
+    (let ((ml (notmuch-show-get-header :List-Post)))
+      (apply orig r)
+      (when ml
+        (with-buffer-modified-unmodified
+         (message-remove-header "To")
+         (message-add-header
+          (format "To: %s"
+                  (replace-regexp-in-string "<mailto:\\(.*\\)>" "\\1" ml)))
+         (message-goto-body))))))
+
+;;; The INTERNET
+
+(use-package link-hint
+  :ensure t
+  :demand t
+  :preface
+  (global-set-key (kbd "M-l") nil)
+  :custom
+  (link-hint-avy-style 'at-full)
+  (link-hint-avy-all-windows t)
+  :config
+  (require '+link-hint)
+  (+link-hint-open-secondary-setup)
+  (+link-hint-open-chrome-setup)
+  :bind
+  (("M-l M-l" . +link-hint-open-link)
+   ("M-l l" . +link-hint-open-link)
+   ("M-l M-o" . +link-hint-open-secondary)
+   ("M-l o" . +link-hint-open-secondary)
+   ("M-l M-m" . +link-hint-open-multiple-links)
+   ("M-l m" . +link-hint-open-multiple-links)
+   ("M-l M-w" . link-hint-copy-link)
+   ("M-l w" . link-hint-copy-link)
+   ("M-l M-c" . +link-hint-open-chrome)
+   ("M-l c" . +link-hint-open-chrome)))
+
+(use-package browse-url
+  :demand t
+  :preface
+  (require '+browse-url)
+  :config
+  (eval-after chd
+    (add-to-list 'browse-url-handlers (cons chd/url-regexps
+                                            #'browse-url-chrome))
+    (add-to-list '+browse-url-other-safe-browser-functions
+                 #'chd/browse-url))
+  (put 'browse-url-browser-function 'safe-local-variable
+       #'+browse-url-browser-function-safe-p)
+  :custom
+  (browse-url-browser-function #'eww-browse-url)
+  (browse-url-chromium-program (choose-executable "chromium"))
+  (browse-url-chrome-program (choose-executable "chrome" "google-chrome-stable"))
+  (browse-url-firefox-program (choose-executable "firefox" "firefox-esr"))
+  (browse-url-firefox-new-window-is-tab t)
+  (browse-url-firefox-arguments '("--new-tab"))
+  (browse-url-generic-program (or browse-url-firefox-program
+                                  browse-url
+                                  browse-url-chrome-program))
+  (browse-url-generic-args
+   (cl-loop for prog in '(firefox chromium chrome)
+            for progfn = (intern (format "browse-url-%s-program"
+                                         prog))
+            for progargs = (intern (format "browse-url-%s-arguments"
+                                           prog))
+            if (equal browse-url-generic-program
+                      (symbol-value progfn))
+            return (symbol-value progargs)
+            finally return nil))
+  (browse-url-handlers
+   `(;; Videos
+     (,(+browse-url-matches "youtube\\.com" "youtu\\.be"
+                            "invidious" "yewtu\\.be"
+                            (rx "." (or "mp4" "gif" "mov" "MOV" "webm")
+                                eos))
+      . +browse-url-with-mpv)
+     ;; Music
+     (,(+browse-url-matches "soundcloud\\.com" "bandcamp\\.com"
+                            (rx "." (or "ogg" "mp3" "opus" "m4a") eos))
+      . +browse-url-with-mpv)
+     ;; Images
+     (,(+browse-url-matches "pbs\\.twimg\\.com"
+                            (rx "." (or "jpeg" "jpg" "png" "bmp" "webp")
+                                eos))
+      . +browse-url-with-mpv-image)
+     ;; Blobs (binary files)
+     (,(+browse-url-matches (rx "." (or ".tar.gz" ".pdf") eos))
+      . +browse-url-download)
+     ;; External URLs --- these are URLs that don't open in EWW very well,
+     ;; so I want to open them in the external browser.
+     (+browse-url-external-url-p . ,(if (featurep 'xwidget-internal)
+                                        #'xwidget-webkit-browse-url
+                                      browse-url-secondary-browser-function))))
+  (+browse-url-external-domains '("github.com" "gitlab.com" "codeberg.org"
+                                  "tildegit.org" "git.tilde.town"
+                                  "google.com" "imgur.com" "twitch.tv"
+                                  "pixelfed" "instagram.com"
+                                  "bibliogram.art" "reddit.com"
+                                  "teddit.net" "libreddit.de"
+                                  "streamable.com" "spotify.com"
+                                  "hetzner.cloud" "melpa.org"
+                                  "twitter.com" ("^t\\.co$")
+                                  "nitter.snopyta.org" "nitter.net")))
+
+(use-package browse-url-transform
+  :after browse-url
+  :load-path "~/src/emacs/browse-url-transform/"
+  :custom
+  (browse-url-transform-alist
+   `(;; Privacy-respecting alternatives
+     ("twitter\\.com" . "nitter.snopyta.org")
+     ("\\(?:\\(?:old\\.\\)?reddit\\.com\\)" . "libreddit.de")
+     ("medium\\.com" . "scribe.rip")
+     (".*substack\\.com.*" . ,substack-proxy)
+     ;; Text-mode of non-text-mode sites
+     ("www\\.npr\\.org" . "text.npr.org")
+     ;; Ask for raw versions of paste sites
+     ("^.*dpaste\\.com.*$" . "\\&.txt")
+     ("bpa\\.st/\\(.*\\)" . "bpa.st/raw/\\1")
+     ("\\(paste\\.debian\\.net\\)/\\(.*\\)" . "\\1/plain/\\2")
+     ("\\(pastebin\\.com\\)/\\\(.*\\)" . "\\1/raw/\\2")
+     ("\\(paste\\.centos\\.org/view\\)/\\(.*\\)" . "\\1/raw/\\2")))
+  :config
+  (browse-url-transform-mode))
+
+(use-package eww
+  :custom
+  (eww-use-browse-url ".")
+  :config
+  (defhook eww-mode-hook
+    (defhook ((visual-fill-column-mode nil :local))
+      :name visual-fill-column@eww-mode-refresh
+      (eww-reload t)))
+  (defkeys eww-mode-map
+    "&" (+browse-url-switch-external-browser eww-mode
+          (plist-get eww-data :url))))
+
+(use-package xwidget
+  :when (featurep 'xwidget-internal)
+  :preface
+  (setenv "WEBKIT_FORCE_SANDBOX" "0")   ; This is probably a bad idea
+  :custom
+  (xwidget-webkit-cookie-file (cache/ "xwidget-cookies"))
+  (xwidget-webkit-download-dir (expand-file-name "~/var/download"))
+  :config
+  (defkeys xwidget-webkit-mode-map
+    "&" (+browse-url-switch-external-browser xwidget-webkit-mode
+          (xwidget-webkit-uri (xwidget-webkit-current-session)))))
+
+(use-package xwwp
+  :load-path "~/src/emacs/xwwp/"
+  :when (featurep 'xwidget-internal)
+  :custom
+  (xwwp-search-prefix "https://duckduckgo.com/?q=")
+  :bind (:map xwidget-webkit-mode-map
+              ("f" . xwwp-follow-link)))
+
+(use-package jabber
+  :load-path "~/src/emacs/emacs-jabber"
+  :custom
+  (jabber-account-list '(("acdw@hmm.st")))
+  (jabber-auto-reconnect t)
+  (jabber-chat-buffer-format "xmpp:%n")
+  (jabber-browse-buffer-format "xmpp-browse:%n")
+  (jabber-groupchat-buffer-format "xmpp-muc:%n")
+  (jabber-muc-private-buffer-format "xmpp-muc-private:%n")
+  (jabber-groupchat-prompt-format "%>10n │ ")
+  (jabber-chat-local-prompt-format "%>10n │ ")
+  (jabber-chat-system-prompt-format " * * * * * *")
+  (jabber-chat-foreign-prompt-format "%>10n │ ")
+  (jabber-muc-private-foreign-prompt-format "%g/%n ")
+  (jabber-last-read-marker  "----------------------------------------")
+  (jabber-muc-header-line-format '("" jabber-muc-topic))
+  (jabber-muc-decorate-presence-patterns
+   '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$")
+     ("." . jabber-muc-presence-dim)))
+  (jabber-activity-make-strings
+   #'jabber-activity-make-strings-shorten)
+  (jabber-rare-time-format " - - - - - - %H:%M %F")
+  :custom-face
+  (jabber-chat-prompt-local ((t :inherit font-lock-keyword-face
+                                :foreground unspecified)))
+  (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign
+                            :foreground unspecified
+                            :weight normal)))
+  (jabber-activity-personal-face ((t :inherit font-lock-warning-face
+                                     :foreground unspecified
+                                     :weight bold)))
+  (jabber-chat-prompt-foreign ((t :inherit font-lock-constant-face
+                                  :foreground unspecified)))
+  (jabber-chat-prompt-system ((t :inherit font-lock-doc-face
+                                 :foreground unspecified)))
+  (jabber-rare-time-face ((t :inherit font-lock-comment-face
+                             :foreground unspecified
+                             :underline nil)))
+  :init
   (defhook (jabber-chat-mode-hook
             jabber-browse-mode-hook
             jabber-roster-mode-hook
             jabber-console-mode-hook)
     :name jabber-ui-setup
+    (visual-fill-column-mode)
     (electric-pair-local-mode -1)
     (auto-fill-mode -1)
-    #'visual-fill-column-mode)
-  (setq-local-hook jabber-chat-mode-hook
-    wrap-prefix (format "%13s" " "))
-  (defun +jabber-fix-keybinds-dammit ()
-    "Jabber autoloads keybinds which is really annoying."
-    (define-key* (current-global-map)
-                 "C-x C-j" #'dired-jump
-                 "C-c j" jabber-global-keymap
-                 "C-c C-SPC" #'jabber-activity-switch-to))
-  (eval-after init (+jabber-fix-keybinds-dammit))
-  (eval-after jabber
-    (require 'jabber-httpupload nil :noerror)
-    (add-hook 'jabber-post-connect-hooks #'jabber-enable-carbons)
-    (remove-hook 'jabber-alert-muc-hooks 'jabber-muc-echo)
-    (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)
-    (add-hook 'jabber-alert-muc-hooks
-              (defun jabber@highlight-acdw (&optional _nick _group buf _text _title)
-                (when buf
-                  (with-current-buffer buf
-                    (let ((regexp (rx word-boundary
-                                      "acdw" ; maybe get from the config?
-                                      word-boundary)))
-                      (hi-lock-unface-buffer regexp)
-                      (highlight-regexp regexp 'hi-blue))))))
-    (add-hook 'window-configuration-change-hook #'jabber-chat-update-focus)
-    (+jabber-fix-keybinds-dammit)
-    (defkeys jabber-chat-mode-map
-      "C-l" (defun +jabber-recenter-last-read ()
-              (interactive)
-              (cond
-               ((eq last-command '+jabber-recenter-last-read)
-                (setq this-command #'recenter)
-                (recenter -1))
-               (:else
-                (save-excursion
-                  (condition-case e
-                      (re-search-backward jabber-last-read-marker)
-                    (search-failed nil)
-                    (:success
-                     (recenter 3)))))))))
-  (defun jabber-chat-kill-buffers ()
-    "Kill all `jabber-chat-mode' buffers."
-    (interactive)
-    (mapc-buffers (lambda () (message "%S" (buffer-name))) '(jabber-chat-mode)))
-  (defun jabber-chat@after-modus-themes-load ()
-    (modus-themes-with-colors
-      (custom-set-faces
-       `(jabber-chat-prompt-foreign ((t :foreground unspecified
-                                        :inherit modus-themes-bold))
-                                    :now)
-       `(jabber-chat-prompt-local ((t :foreground unspecified
-                                      :inherit modus-themes-bold))
-                                  :now)
-       `(jabber-chat-prompt-system ((t :foreground unspecified
-                                       :inherit modus-themes-bold))
-                                   :now)
-       `(jabber-activity-face ((t :slant italic)))
-       `(jabber-activity-personal-face ((t :slant italic :weight bold)))
-       `(jabber-rare-time-face ((t :inherit font-lock-comment-face)))))
-    (setq jabber-muc-nick-value
-          (pcase (frame--current-backround-mode (selected-frame))
-            ('light 0.5)
-            ('dark 1.0))))
-  (eval-after modus-themes
-    (add-hook 'modus-themes-after-load-theme-hook
-              #'jabber-chat@after-modus-themes-load))
-  (when (or (custom-theme-enabled-p 'modus-operandi)
-            (custom-theme-enabled-p 'modus-vivendi))
-    (jabber-chat@after-modus-themes-load))
-  (eval-after (consult jabber)
-    ;; Jabber.el chat buffers source for `consult-buffer'
+    (setq-local wrap-prefix (format "%13s" " ")))
+  :bind-keymap ("C-c j" . jabber-global-keymap)
+  :bind (("C-c C-SPC" . jabber-activity-switch-to))
+  :config
+  (global-set-key (kbd "C-x C-j") #'dired-jump) ; Extremely annoying fix
+  (require 'jabber-httpupload nil :noerror)
+  (add-hook 'jabber-post-connect-hooks #'jabber-enable-carbons)
+  (remove-hook 'jabber-alert-muc-hooks 'jabber-muc-echo)
+  (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)
+  (add-hook 'jabber-alert-muc-hooks
+            (defun jabber@highlight-acdw (&optional _nick _group buf _text _title)
+              (when buf
+                (with-current-buffer buf
+                  (let ((regexp (rx word-boundary
+                                    "acdw" ; maybe get from the config?
+                                    word-boundary)))
+                    (hi-lock-unface-buffer regexp)
+                    (highlight-regexp regexp 'hi-blue))))))
+  (add-hook 'window-configuration-change-hook #'jabber-chat-update-focus)
+  (eval-after consult
     (defvar jabber-chat-buffer-source
       `( :name "Jabber"
          :hidden nil
@@ -1238,190 +987,3 @@ CAPES defaults to `+capes'.  CAPF will be made un-exclusive."
     (add-to-list 'consult-buffer-sources 'jabber-chat-buffer-source :append)
     ;; Also hide xmpp buffers from regular buffer list
     (add-to-list 'consult-buffer-filter "\\`xmpp" nil #'string-equal)))
-
-(yoke (link-hint "https://github.com/noctuid/link-hint.el/")
-  :depends ((avy "https://github.com/abo-abo/avy"))
-  (require '+link-hint)
-  (+link-hint-open-secondary-setup)
-  (+link-hint-open-chrome-setup)
-  (setf link-hint-avy-style 'at-full
-        link-hint-avy-all-windows t)
-  (global-set-key (kbd "M-l") +link-hint-map)
-  (define-key* +link-hint-map
-               "M-l" #'+link-hint-open-link "l" #'+link-hint-open-link
-               "M-o" #'+link-hint-open-secondary "o" #'+link-hint-open-secondary
-               "M-m" #'+link-hint-open-multiple-links "m" #'+link-hint-open-multiple-links
-               "M-w" #'link-hint-copy-link "w" #'link-hint-copy-link
-               "M-c" #'+link-hint-open-chrome "c" #'+link-hint-open-chrome))
-
-(yoke (elpher "git://thelambdalab.xyz/elpher.git")
-  (eval-after elpher
-    (define-key* elpher-mode-map
-                 "l" #'elpher-back)))
-
-(yoke (epithet "https://github.com/oantolin/epithet")
-  (defhook (Info-selection-hook
-            help-mode-hook
-            occur-mode-hook
-            shell-mode-hook)
-    #'epithet-rename-buffer)
-  (cond ((boundp 'eww-auto-rename-buffer)
-         (setc eww-auto-rename-buffer 'title))
-        (:else (defhook eww-after-render-hook #'epithet-rename-buffer))))
-
-(yoke browse-url
-  (require '+browse-url)
-  (setf browse-url-browser-function #'eww-browse-url
-        browse-url-chrome-program (seq-some #'executable-find
-                                            '("chromium" "chrome" "google-chrome-stable"))
-        browse-url-firefox-program (seq-some #'executable-find
-                                             '("firefox" "firefox-esr"))
-        browse-url-generic-program (or browse-url-firefox-program
-                                       browse-url-chrome-program)
-        browse-url-firefox-new-window-is-tab t
-        browse-url-firefox-arguments "-new-tab"
-        browse-url-handlers `((video-url-p . +browse-url-with-mpv)
-                              (music-url-p . +browse-url-with-mpv)
-                              (image-url-p . +browse-image-with-mpv)
-                              (blobp . +browse-url-download)
-                              (external-url-p . ,browse-url-secondary-browser-function)
-                              ;; HERE FOR REFERENCE --- OPEN MASTO URLS SOME WAY
-                              (,(defun mastodon-url-p (url)
-                                  "Try to determine whether URL is a mastodon URL."
-                                  (string-match-p "/@[^/]+\\(/\\|/[[:digit:]]+\\)?$" url))
-                               . ,browse-url-secondary-browser-function)))
-  (+browse-url-make-external-viewer-handler "mpv" '("--cache-pause-wait=30"
-                                                    "--cache-pause-initial=yes")
-                                            "Video URL: "
-                                            :fallback browse-url-secondary-browser-function)
-  (+browse-url-make-external-viewer-handler "mpv" '("--image-display-duration=inf")
-                                            "Image URL: "
-                                            :name +browse-image-with-mpv)
-  (defun video-url-p (url) "Is URL a video?"
-         (string-match-p (rx (or "youtube.com" "youtu.be" "invidious" "yewtu.be"
-                                 (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)))
-                         url))
-  (defun music-url-p (url) "Is URL music?"
-         (string-match-p (rx "soundcloud.com" "bandcamp.com"
-                             (seq "." (or "ogg" "mp3" "opus" "m4a" "flac") eos))
-                         url))
-  (defun image-url-p (url) "Is URL an image?"
-         (string-match-p (rx
-                          (or (: "." (or "jpeg" "jpg" "png" "bmp" "webp") eos)
-                              "pbs.twimg.com"))
-                         url))
-  (defun external-url-p (url) "Should URL open in an external browser?"
-         (string-match-p  (rx (or "github.com" "gitlab.com" "codeberg.org"
-                                  "tildegit.org" "git.tilde.town" "google.com"
-                                  "imgur.com" "twitch.tv" "pixelfed" "instagram.com"
-                                  "bibliogram.art" "reddit.com" "teddit.net"
-                                  ;; "twitter.com" "nitter" "t.co"
-                                  "streamable.com" "spotify.com"
-                                  "hetzner.cloud" "melpa.org"))
-                          url))
-  (defun blobp (url) "Is URL some other blob that can't open in Emacs?"
-         (string-match-p (rx (or (: (or ".tar.gz" ".pdf")
-                                    eos)))
-                         url))
-  (eval-after chd
-    (add-to-list 'browse-url-handlers (cons chd/url-regexps #'chd/browse-url)))
-  (require 'browse-url-transform)
-  (setf browse-url-transform-alist `(;; Privacy-respecting alternatives
-                                     ("twitter\\.com" . "nitter.snopyta.org")
-                                     ("\\(?:\\(?:old\\.\\)?reddit\\.com\\)"
-                                      . "libreddit.de")
-                                     ("medium\\.com" . "scribe.rip")
-                                     ;; Text-mode of non-text-mode sites
-                                     ("www\\.npr\\.org" . "text.npr.org")
-                                     ;; Ask for raw versions of paste sites
-                                     ("^.*dpaste\\.com.*$" . "\\&.txt")
-                                     ("bpa\\.st/\\(.*\\)" . "bpa.st/raw/\\1")
-                                     ("\\(paste\\.debian\\.net\\)/\\(.*\\)"
-                                      . "\\1/plain/\\2")
-                                     ("\\(pastebin\\.com\\)/\\\(.*\\)"
-                                      . "\\1/raw/\\2")
-                                     ("gist\\.github\\.com/\\(.*\\)"
-                                      . "gist.githubusercontent.com/\\1/raw/")))
-  (browse-url-transform-mode))
-
-(yoke eww
-  (setc eww-use-browse-url ".")
-  (eval-after eww
-    (defhook eww-mode-hook
-      #'visual-fill-column-mode
-      (defhook ((visual-fill-column-mode-hook nil :local))
-        :name eww-mode-refresh@visual-fill-column
-        (eww-reload t)))
-    (defkeys eww-mode-map
-      "&"
-      (defun +eww-browse-with-external-browser (&optional url)
-        "Browse URL with an external browser and close eww."
-        (interactive nil eww-mode)
-        (condition-case e
-            ;; This is wrapped in a `condition-case' so that the eww window
-            ;; won't close if there's an error calling the browser.
-            (funcall browse-url-secondary-browser-function
-                     (or url (plist-get eww-data :url)))
-          (:success
-           (when (null url)                 ; interactive
-             (quit-window)))
-          (t (signal (car e) (cdr e)))))))
-  (eval-after (eww link-hint)
-    (defkeys eww-mode-map
-      "f" #'+link-hint-open-link)))
-
-(yoke tab-bar
-  (setf tab-bar-show t
-        global-mode-string
-        '((jabber-activity-mode
-           (:eval
-            (let ((str (or (bound-and-true-p jabber-activity-mode-string)
-                           "")))
-              (concat (truncate-string-to-width str 20 nil nil t)
-                      (if (< 0 (length str)) " ⋅" "")))))
-          display-time-string
-          "|"))
-  (eval-after jabber
-    (defhook jabber-activity-mode-hook
-      (setf global-mode-string
-            '((jabber-activity-mode
-               (:eval
-                (let ((str (or (bound-and-true-p jabber-activity-mode-string)
-                               "")))
-                  (concat (truncate-string-to-width str 20 nil nil t)
-                          (if (< 0 (length str)) " ⋅" "")))))
-              display-time-string
-              "|"))))
-  (add-to-list 'tab-bar-format 'tab-bar-format-align-right :append)
-  (add-to-list 'tab-bar-format 'tab-bar-format-global :append)
-  (tab-bar-mode))
-
-(yoke (pdf-tools "https://github.com/vedang/pdf-tools"
-                 :load "lisp")
-  :depends ((tablist "https://github.com/politza/tablist/"))
-  :when (executable-find "epdfinfo")    ; installed from Debian repos
-  (pdf-tools-install))
-
-(yoke which-function
-  (setf (alist-get 'which-function-mode mode-line-misc-info)
-        '((which-func-mode              ; Only display if buffer supports it
-           (:eval (when (which-function)
-                    (list "" which-func-format " "))))))
-  (which-function-mode))
-
-(yoke (zzz-to-char "https://github.com/mrkkrp/zzz-to-char")
-  :depends ((avy "https://github.com/abo-abo/avy"))
-  (setf zzz-to-char-reach 120)
-  (defkeys t
-    [remap zap-to-char]
-    (defun +zzz-to-char (&optional prefix)
-      "Run `zzz-up-to-char', or `zzz-to-char' with PREFIX."
-      (interactive "P")
-      (call-interactively (cond (prefix #'zzz-to-char)
-                                (:else #'zzz-up-to-char))))))
-
-(yoke sh-mode
-  (defhook sh-mode-hook
-    :name turn-off-sh-electric-here-document-mode
-    (sh-electric-here-document-mode -1)))
-