2 files changed, 915 insertions, 888 deletions

@@ -20,10 +20,50 @@
 
 ;; NOTE that some of the names in `setup' forms are arbitrary.
 
-(setup (:straight (0x0
-                   :host gitlab
-                   :repo "willvaughn/emacs-0x0"))
-  (:option 0x0-default-server 'ttm))
+(setup (:require auth-source)
+  (:option auth-sources '("~/.authinfo" "~/.authinfo.gpg")))
+
+(setup (:require gforth)
+  (:autoload forth-mode
+             forth-block-mode)
+  (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
+  (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
+
+(setup (:require goto-addr)
+  (if (fboundp #'global-goto-address-mode)
+      (global-goto-address-mode)
+    (add-hook 'after-change-major-mode-hook #'goto-address-mode)))
+
+(setup (:require recentf)
+  (:option recentf-save-file (acdw/dir "recentf.el")
+           recentf-max-menu-items 100
+           recentf-max-saved-items nil
+           recentf-auto-cleanup 'mode
+           (append recentf-exclude) (acdw/dir))
+
+  (:advise dired-rename-file :after #'rjs/recentf-rename-notify)
+  
+  (recentf-mode +1))
+
+(setup (:require savehist)
+  (:option history-length t
+           history-delete-duplicates t
+           savehist-autosave-interval 60
+           savehist-file (acdw/dir "savehist.el"))
+
+  (dolist (var '(extended-command-history
+                 global-mark-ring
+                 kill-ring
+                 regexp-search-ring
+                 search-ring
+                 mark-ring))
+    (:option (append savehist-additional-variables) var))
+  
+  (savehist-mode +1))
+
+(setup (:require server)
+  (unless (server-running-p)
+    (server-start)))
 
 (setup Info
   (:hook #'variable-pitch-mode
@@ -51,79 +91,45 @@
   (defun acdw/sort-setups ()
     "Sort `setup' forms in the current buffer.
 Actually sorts all forms, but based on the logic of `setup'.
-AKA, DO NOT USE THIS FUNCTION!!!"
+In short, DO NOT USE THIS FUNCTION!!!"
     (save-excursion
-      (sort-sexps (point-min) (point-max)
-                  (lambda (sexp)
-                    (let ((name (cadr sexp)))
-                      (symbol-name (if (listp name) ; this is /terrible/!
-                                       (if (keywordp (car name)) 
-                                           (let ((feature (cadr name)))
-                                             (if (listp feature)
-                                                 (car feature)
-                                               feature))
-                                         (car name))
-                                     name))))))))
-
-(setup (:straight-if affe
-                     (and (or (executable-find "fd")
-                              (executable-find "find"))
-                          (executable-find "rg")))
-  ;; Keys are bound in `acdw/sensible-grep' and `acdw/sensible-find'
-  (:option affe-regexp-compiler
-           (defun affe-orderless-regexp-compiler (input _type)
-             (setq input (orderless-pattern-compiler input))
-             (cons input (lambda (str) (orderless--highlight input str))))))
-
-(setup (:straight-if ahk-mode
-                     (acdw/system :work)))
-
-(setup (:straight alert)
-  (:option alert-default-style (acdw/system
-                                (:home 'libnotify)
-                                (_ 'message))))
-
-(setup (:straight (apheleia
-                   :host github
-                   :repo "raxod502/apheleia"))
-  
-  (apheleia-global-mode +1)
-
-  ;; Use a dumb formatter on modes that `apheleia' doesn't work for.
-  (add-hook 'before-save-hook
-            (defun before-save@dumb-auto-format ()
-              (setq stupid-modes '(makefile-mode
-                                   org-mode))    
-              ;; If there's no apheleia formatter for the mode, just indent the
-              ;; buffer.
-              (unless (or (apply #'derived-mode-p stupid-modes)
-                          (and (fboundp 'apheleia--get-formatter-command)
-                               (apheleia--get-formatter-command)))
-                (indent-region (point-min) (point-max))))))
-
-(setup (:straight async)
-  (dired-async-mode +1)
-
-  (:with-feature dired
-    (:hook (defun dired@disable-dired-async-mode-line ()
-             (autoload 'dired-async--modeline-mode "dired-async" nil t)
-             (dired-async--modeline-mode -1)))))
-
-(setup (:require auth-source)
-  (:option auth-sources '("~/.authinfo" "~/.authinfo.gpg")))
+      (sort-sexps
+       (point-min) (point-max)
+       (lambda (sexp)
+         (format "%S" (cadr sexp)))
+       (lambda (s1 s2)                  ; oh god, this is worse.
+         (let* ((s1 (cdr s1)) (s2 (cdr s2)) ; for the strings themselves
+                (s1-require (string-match ":require" s1))
+                (s2-require (string-match ":require" s2))
+                (s1-straight (string-match ":straight" s1))
+                (s2-straight (string-match ":straight" s2))
+                (s1-bare (not (or s1-require s1-straight)))
+                (s2-bare (not (or s2-require s2-straight))))
+           (cond
+            ;; if both are the same, sort regular style
+            ((or (and s1-require s2-require)
+                 (and s1-bare s2-bare))
+             (string< s1 s2))
+            ((and s1-straight s2-straight)
+             (let* ((r (rx ":straight" (? "-if") (* space) (? "(")))
+                    (s1 (replace-regexp-in-string r "" s1))
+                    (s2 (replace-regexp-in-string r "" s2)))
+               (message "'%S' '%S'" s1 s2)
+               (string< s1 s2)))
+            ;; requires should go first
+            ((and s1-require (not s2-require)) t)
+            ((and (not s1-require) s2-require) nil)
+            ;; straights should go last
+            ((and s1-straight (not s2-straight)) nil)
+            ((and (not s1-straight) s2-straight) t)
+            ;; else, just sort em.
+            (t (string< s1 s2)))))))))
 
 (setup autorevert
   (:option global-auto-revert-non-file-buffers t
            auto-revert-verbose nil)
   (global-auto-revert-mode +1))
 
-(setup (:straight avy)
-  (:global "C-'" #'avy-goto-char-timer
-           "C-c C-j" #'avy-resume)
-
-  (:with-feature isearch
-    (:bind "C-'" #'avy-isearch)))
-
 (setup browse-url
   (:require acdw-browse-url)
   
@@ -186,6 +192,829 @@ AKA, DO NOT USE THIS FUNCTION!!!"
 (setup calendar
   (:option calendar-week-start-day 1))
 
+(setup completion
+  (:option completion-ignore-case t
+           read-buffer-completion-ignore-case t
+           completion-styles '(substring partial-completion)
+           completion-category-defaults nil
+           completion-category-overrides
+           '((file (styles . (partial-completion)))))
+
+  (:global "M-/" #'hippie-expand))
+
+(setup cursor
+  (:option cursor-type 'bar
+           cursor-in-non-selected-windows 'hollow
+           blink-cursor-blinks 1)
+  (blink-cursor-mode +1))
+
+(setup cus-edit
+  (:option custom-file null-device      ; don't store customizations
+           custom-magic-show nil
+           custom-magic-show-button t
+           custom-raised-buttons nil
+           custom-unlispify-tag-names nil
+           custom-variable-default-form 'lisp)
+
+  ;; `Custom-mode-hook' fires /before/ the widgets are built, so I have to
+  ;; install advice after the widgets are made.
+  (:advise custom-buffer-create :after
+           (defun custom-buffer@expand-widgets (&rest _)
+             "Expand descriptions in `Custom-mode' buffers."
+             (interactive)
+             ;; "More/Hide" widgets (thanks alphapapa!)
+             (widget-map-buttons (lambda (widget _)
+                                   (pcase (widget-get widget :off)
+                                     ("More" (widget-apply-action widget)))
+                                   nil))
+             ;; "Show Value" widgets (the little triangles)
+             (widget-map-buttons (lambda (widget _)
+                                   (pcase (widget-get widget :off)
+                                     ("Show Value"
+                                      (widget-apply-action widget)))
+                                   nil))))
+
+  (:with-mode Custom-mode
+    (:local-set imenu-generic-expression ; thanks u/oantolin!
+                '(("Faces" (rx (seq bol
+                                    (or "Show" "Hide") " "
+                                    (group (zero-or-more nonl))
+                                    " face: [sample]"))
+                   1)
+                  ("Variables" (rx (seq bol
+                                        (or "Show Value" "Hide") " "
+                                        (group (zero-or-more
+                                                (not (any "\n:"))))))
+                   1)))))
+
+(setup debugger
+  (:hook visual-line-mode))
+
+(setup dired
+  (:also-load dired-x)
+  (:straight dired-subtree
+             dired-collapse
+             dired-git-info)
+  
+  (:option dired-recursive-copies 'always
+           dired-recursive-deletes 'always
+           delete-by-moving-to-trash t
+           dired-listing-switches "-Al"
+           ls-lisp-dirs-first t
+           dired-ls-F-marks-symlinks t
+           dired-no-confirm '(byte-compile
+                              chgrp chmod chown copy
+                              hardlink load move
+                              shell touch symlink)
+           dired-dwim-target t)
+
+  (:bind "TAB" #'dired-subtree-cycle
+         "i" #'dired-subtree-toggle
+         ")" #'dired-git-info-mode)
+
+  (:hook dired-collapse-mode
+         dired-hide-details-mode
+         hl-line-mode)
+  
+  (:global "C-x C-j" #'dired-jump)
+
+  (with-eval-after-load 'dired
+    (acdw/system
+     (:work (:straight w32-browser)
+            (autoload #'dired-w32-browser "w32-browser" nil t)
+            (:bind "RET" #'dired-w32-browser))
+     (:home (:straight dired-open)
+            (autoload #'dired-find-alternate-file "dired-open" nil t)
+            (:bind "RET" #'dired-find-alternate-file)))))
+
+(setup disabled
+  ;; While this stuff is defined in novice.el, I'm using 'disabled' as the name
+  ;; for easy finding.
+
+  ;; Enable all disabled commands.
+  ;; This is an option, but I'm going to try /enabling/ just the ones that I
+  ;; use instead.
+  ;; (mapatoms (lambda (symbol)
+  ;;             (when (get symbol 'disabled)
+  ;;               (put symbol 'disabled nil))))
+
+  ;; Enable /some/ disabled commands
+  (dolist (enable-sym '(narrow-to-region
+                        dired-find-alternate-file
+                        narrow-to-page))
+    (put enable-sym 'disabled nil))
+  
+  ;; Now, disable symbols as I wish.
+  (dolist (disable-sym '(view-hello-file
+                         suspend-frame
+                         scroll-left
+                         scroll-right
+                         comment-set-column
+                         set-fill-column))
+    (put disable-sym 'disabled t))
+  
+  ;; And set the disabled function to something better than the default.
+  ;; Now, I can run any disabled command, but I have to use M-x to do it.
+  (setq disabled-command-function
+        (defun acdw/disabled-command-function (&optional cmd keys)
+          (let ((cmd (or cmd this-command))
+                (keys (or keys (this-command-keys))))
+            ;; this logic stolen from original `disabled-command-function'
+            (if (or (eq (aref keys 0) (if (stringp keys)
+                                          (aref "\M-x" 0)
+                                        ?\M-x))
+                    (and (>= (length keys) 2)
+                         (eq (aref keys 0) meta-prefix-char)
+                         (eq (aref keys 1) ?x)))
+                ;; it's been run as an M-x command, we want to do it
+                (call-interactively cmd)
+              ;; else, tell the user it's disabled.
+              (message (substitute-command-keys
+                        (concat "Command `%s' has been disabled.  "
+                                "Run with \\[execute-extended-command]."))
+                       cmd))))))
+
+(setup ediff
+  (:option ediff-diff-options "-w" ; ignore whitespace
+           ediff-window-setup-function #'ediff-setup-windows-plain
+           ediff-split-window-function #'split-window-horizontally)
+  ;; https://oremacs.com/2015/01/17/setting-up-ediff/
+  (add-hook 'ediff-after-quit-hook-internal #'winner-undo))
+
+(setup eldoc
+  (:option eldoc-idle-delay 0.1
+           eldoc-echo-area-use-multiline-p nil))
+
+(setup elisp-mode
+  (:with-mode emacs-lisp-mode ;; -_-
+    (:option eval-expression-print-length nil
+             eval-expression-print-level nil
+             lisp-indent-function #'lisp-indent-function)
+
+    (:local-set (append imenu-generic-expression)
+                `("Setup"
+                  ,(rx (seq
+                        (group bol (* space) "(setup" (+ space))
+                        (? (group "(:" (+ graph) (* space) (? "(")))
+                        (group (+ (any word ?-)))))
+                  3))
+
+    (:hook #'checkdoc-minor-mode
+           #'turn-on-eldoc-mode)
+
+    ;; Emulate slime's eval binds
+    (:bind "C-c C-c" #'eval-defun
+           "C-c C-k" #'acdw/eval-region-or-buffer
+           "C-c C-z" #'ielm)
+    
+    ;; Add advice to pulse evaluated regions
+    (:advise eval-region :around
+             (defun eval-region@pulse (fn beg end &rest args)
+               (pulse-momentary-highlight-region beg end)
+               (apply fn beg end args))))
+
+  (:with-mode lisp-interaction-mode ;; -___-
+    (:bind "C-c C-c" #'eval-defun
+           "C-c C-k" #'acdw/eval-region-or-buffer
+           "C-c C-z" #'ielm)))
+
+(setup emacs
+  ;; "Et cetera" settings
+  ;; This should stay as /minimal/ as possible.  Anything that can go somewhere
+  ;; else /should/ go there.
+  (:option
+   attempt-orderly-shutdown-on-fatal-signal nil
+   attempt-stack-overflow-recovery nil
+   echo-keystrokes 0.01
+   find-function-C-source-directory (acdw/find-emacs-source)
+   kill-read-only-ok t
+   load-prefer-newer t
+   native-comp-async-report-warnings-errors nil
+   password-cache t
+   password-cache-expiry 3600           ; 5 minutes
+   set-mark-command-repeat-pop t)
+
+  (when (fboundp 'command-completion-default-include-p)
+    (setq read-extended-command-predicate
+          #'command-completion-default-include-p))
+
+  (defvar case-map (make-sparse-keymap)
+    "A keymap for setting case in various ways.")
+  (global-set-key (kbd "C-c c") case-map)
+
+  (defvar lookup-map (make-sparse-keymap)
+    "A keymap for looking up things.")
+  (global-set-key (kbd "C-c l") lookup-map)
+
+  (defvar toggle-map (make-sparse-keymap)
+    "A keymap for toggling!")
+  (global-set-key (kbd "C-c t") toggle-map)
+
+  (:global "M-=" #'count-words
+           "C-w" #'kill-region-or-backward-word
+           "C-c d" #'acdw/insert-iso-date
+           "M-`" nil
+           "C-x o" #'acdw/other-window-or-switch-buffer
+           "C-x O" #'acdw/other-window-or-switch-buffer-backward
+           "C-c _" #'add-file-local-variable
+           "C-x C-c" #'acdw/fat-finger-exit)
+
+  (:with-map toggle-map
+    (:bind "c" #'column-number-mode
+           "l" #'display-line-numbers-mode
+           "d" #'toggle-debug-on-error))
+
+  (:with-map case-map
+    (require 'titlecase)
+    (:bind "c" #'capitalize-dwim
+           "t" #'titlecase-dwim
+           "u" #'upcase-dwim
+           "l" #'downcase-dwim
+           "s" (defun studlify-dwim (count)
+                 "Studlify region if active, or COUNT words if not."
+                 (interactive "*p")
+                 (if (region-active-p)
+                     (studlify-region (region-beginning) (region-end))
+                   (studlify-word count)))))
+  
+  (add-hook 'after-make-frame-functions
+            (defun after-make-frame@maximize (frame)
+              (unless (bound-and-true-p edit-server-frame-p)
+                (toggle-frame-maximized frame)))))
+
+(setup encoding
+  (:option locale-coding-system 'utf-8-unix
+           coding-system-for-read 'utf-8-unix
+           coding-system-for-write 'utf-8-unix
+           buffer-file-coding-system 'utf-8-unix
+           default-process-coding-system '(utf-8-unix . utf-8-unix)
+           x-select-request-type '(UTF8_STRING
+                                   COMPOUND_TEXT
+                                   TEXT
+                                   STRING))
+
+  (set-charset-priority 'unicode)
+  (set-language-environment "UTF-8")
+  (prefer-coding-system 'utf-8-unix)
+  (set-default-coding-systems 'utf-8-unix)
+  (set-terminal-coding-system 'utf-8-unix)
+  (set-keyboard-coding-system 'utf-8-unix)
+
+  (acdw/system
+   (:work (set-clipboard-coding-system 'utf-16-le)
+          (set-selection-coding-system 'utf-16-le))
+   (_ (set-selection-coding-system 'utf-8)
+      (set-clipboard-coding-system 'utf-8))))
+
+(setup eshell
+  (:also-load acdw-eshell
+              em-smart
+              em-tramp)
+
+  (:option eshell-aliases-file (acdw/dir "eshell/aliases" t)
+           eshell-destroy-buffer-when-process-dies t
+           eshell-directory-name (acdw/dir "eshell/" t)
+           eshell-error-if-no-glob t
+           eshell-hist-ignore-dups t
+           eshell-kill-on-exit nil
+           eshell-prefer-lisp-functions t ; I want to try using eshell
+           eshell-prefer-lisp-variables t ; as much as possible.
+           eshell-review-quick-commands nil
+           eshell-save-history-on-exit t
+           eshell-scroll-to-bottom-on-input 'all
+           eshell-smart-space-goes-to-end t
+           eshell-where-to-jump 'begin)
+
+  (:local-set outline-regexp eshell-prompt-regexp
+              page-delimiter eshell-prompt-regexp)
+
+  (:bind "C-d" #'eshell-quit-or-delete-char)
+
+  (:hook #'eshell-arg-hist-mode
+         (defun eshell-mode@setup ()
+           (unless (bound-and-true-p eshell-customizations-loaded)
+             (load (expand-file-name "eshell" user-emacs-directory))))))
+
+(setup eww
+  (defvar-local eww-readable-p nil
+    "Whether current buffer is in readable-mode.")
+  (:option eww-search-prefix "https://duckduckgo.com/html?q="
+           url-privacy-level '(email agent cookies lastloc))
+
+  (defun eww@is-readable (&rest _)
+    (setq-local eww-readable-p t))
+  (defun eww@is-not-readable (&rest _)
+    (setq-local eww-readable-p nil))
+  
+  (advice-add 'eww-readable :after #'eww@is-readable)
+  (advice-add 'eww-render :after #'eww@is-not-readable)
+  (advice-add 'eww-back-url :after #'eww@is-not-readable)
+  
+  (:hook #'reading-mode))
+
+(setup files
+  (:option
+   auto-save-file-name-transforms `((".*" ,(acdw/dir "auto-save/" t) t))
+   auto-save-list-file-prefix (acdw/dir "auto-save-list/.saves-" t)
+   auto-save-interval 60
+   auto-save-timeout 60
+   auto-save-visited-interval auto-save-timeout
+   backup-by-copying t
+   backup-directory-alist `((".*" . ,(acdw/dir "backup/" t)))
+   delete-old-versions t
+   mode-require-final-newline 'visit-save
+   tramp-backup-directory-alist backup-directory-alist
+   vc-make-backup-files t
+   version-control t)
+
+  (auto-save-visited-mode +1))
+
+(setup find-func
+  (:global "C-c l f" #'find-function
+           "C-c l l" #'find-library
+           "C-c l v" #'find-variable))
+
+(setup flymake
+
+  (defvar-local flymake-inhibit nil
+    "Buffer-local variable to inhibit `flymake'.")
+  (add-to-list 'safe-local-variable-values '(flymake-inhibit . t))
+  (add-to-list 'safe-local-variable-values '(flymake-inhibit . nil))
+
+  (defvar flymake-inhibit-major-modes nil
+    "Which major-modes NOT to enable `flymake' in.")
+
+  (defvar flymake-inhibit-file-name-regexps '("init\\.el\\'"
+                                              "early-init\\.el\\'")
+    "List of file regexps NOT to enable `flymake' in.")
+
+  (defvar flymake-inhibit-buffer-name-regexps (list (rx "*scratch*"))
+    "List of buffer-name regexps NOT to enable `flymake' in.")
+
+  (defun list-string-match-p (string regexp-list)
+    "Return t if at least one regex in RETGEXP-LIST matches STRING, else nil."
+    (when string                        ; if STRING is nil, return nil.
+      (catch 'found
+        (dolist (regexp regexp-list)
+          (when (string-match regexp string)
+            (throw 'found t))))))
+
+  (defun flymake-unless ()
+    "Turn on `flymake-mode', UNLESS it's inhibited.
+There are three methods to inhibit flymake in a file.  From most
+specific to most general, they are these:
+
+- `flymake-inhibit': a file-local-variable
+
+- `flymake-inhibit-buffer-name-regexps': a list of regexps to
+  match the buffer name against.  If one of them matches, inhibit
+  `flymake-mode'.
+
+- `flymake-inhibit-file-name-regexps': a list of regexps to match
+  the filename against.  If one of them matches, inhibit
+  `flymake-mode'.
+
+- `flymake-inhibit-major-modes': a list of major-modes in which
+  to inhibit `flymake-mode'.  Really only useful if you want to
+  generally add `flymake-mode' to `prog-mode-hook'."
+    (unless (or (bound-and-true-p flymake-inhibit) ; file-local variable
+                (list-string-match-p (buffer-name)
+                                     flymake-inhibit-buffer-name-regexps)
+                (list-string-match-p (buffer-file-name)
+                                     flymake-inhibit-file-name-regexps)
+                (apply #'derived-mode-p flymake-inhibit-major-modes))
+      (flymake-mode-on)))
+
+  (add-hook 'prog-mode-hook #'flymake-unless)
+  
+  (:bind "M-n" #'flymake-goto-next-error
+         "M-p" #'flymake-goto-prev-error))
+
+(setup flyspell
+  (:hook-into text-mode))
+
+(setup frames
+  (:option frame-title-format '("%b@"
+                                (:eval
+                                 (or (file-remote-p default-directory 'host)
+                                     system-name))
+                                " %+%* GNU Emacs"
+                                (:eval (when (frame-parameter nil 'client)
+                                         " Client")))
+           window-resize-pixelwise t))
+
+(setup ibuffer
+  (:also-load ibuf-ext)
+  (:option ibuffer-expert t
+           ibuffer-show-empty-filter-groups nil
+           ibuffer-saved-filter-groups
+           '(("default"
+              ("dired" (mode . dired-mode))
+              ("customize" (mode . Custom-mode))
+              ("emacs" (or (name . "^\\*scratch\\*$")
+                           (name . "^\\*Messages\\*$")
+                           (name . "^\\*Warnings\\*$")
+                           (name . "^\\*straight-process\\*$")
+                           (name . "^\\*Calendar\\*$")))
+              ("git" (or (name . "^\*magit")
+                         (name . "^\magit")))
+              ("help" (or (mode . help-mode)
+                          (mode . Info-mode)
+                          (mode . helpful-mode)))
+              ("messaging" (or (mode . message-mode)
+                               (mode . bbdb-mode)
+                               (mode . mail-mode)
+                               (mode . gnus-group-mode)
+                               (mode . gnus-summary-mode)
+                               (mode . gnus-article-mode)
+                               (name . "^\\.bbdb$")
+                               (name . "^\\.newsrc-dribble")
+                               (mode . erc-mode)
+                               (mode . circe-server-mode)
+                               (mode . circe-channel-mode)))
+              ("shell" (or (mode . eshell-mode)
+                           (mode . shell-mode)
+                           (mode . vterm-mode)))
+              ("web" (or (mode . elpher-mode)
+                         (mode . gemini-mode)
+                         (mode . eww-mode))))))
+
+  (:global "C-x C-b" #'ibuffer)
+
+  (:hook (defun ibuffer@filter-to-default ()
+           (ibuffer-switch-to-saved-filter-groups "default"))))
+
+(setup ielm
+  (:hook #'turn-on-eldoc-mode))
+
+(setup imenu
+  (:option imenu-auto-rescan t))
+
+(setup isearch
+  (:option search-default-mode t))
+
+(setup lines
+  (:option fill-column 79
+           word-wrap t
+           truncate-lines nil)
+
+  (global-display-fill-column-indicator-mode +1)
+  (global-so-long-mode +1)
+
+  (add-hook 'visual-line-mode-hook
+            (defun acdw/disable-fill-column-indicator ()
+              (display-fill-column-indicator-mode
+               (if visual-line-mode -1 +1))))
+
+  ;; `acdw/kill-line-and-join-advice' cribs from `crux-kill-and-join-forward'.
+  ;; I can't simply advise `kill-line' with an override from crux because crux
+  ;; itself calls `kill-line', leading to a infinite nesting situation.
+  (advice-add 'kill-line :around
+              (defun kill-line@join (fn &rest args)
+                (if (and (eolp)
+                         (not (bolp)))
+                    (delete-indentation 1)
+                  (apply fn args)))))
+
+(setup minibuffer
+  (:option enable-recursive-minibuffers t
+           file-name-shadow-properties '(invisible t intangible t)
+           minibuffer-eldef-shorten-default t
+           minibuffer-prompt-properties
+           '(read-only t cursor-intangible t face minibuffer-prompt)
+           read-answer-short t
+           read-extended-command-predicate ; used on >28
+           #'command-completion-default-include-p)
+
+  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
+  
+  (add-hook 'minibuffer-setup-hook #'acdw/gc-disable)
+  (add-hook 'minibuffer-exit-hook #'acdw/gc-enable)
+  
+  (minibuffer-depth-indicate-mode +1)
+  (file-name-shadow-mode +1)
+  (minibuffer-electric-default-mode +1)
+
+  (if (version< emacs-version "28")
+      (fset 'yes-or-no-p #'y-or-n-p)
+    (setq use-short-answers t)))
+
+(setup mouse-avoidance
+  (mouse-avoidance-mode 'exile))
+
+(setup page
+  (:option page-delimiter
+           (rx bol (or "\f" ";;;")
+               (not (any "#")) (* not-newline) "\n"
+               (* (* blank) (opt ";" (* not-newline)) "\n")))
+  
+  (defun recenter-to-top (&rest _)
+    "Recenter the cursor to the top of the window."
+    (when (called-interactively-p 'any)
+      (recenter (if (or (null scroll-margin)
+                        (zerop scroll-margin))
+                    3
+                  scroll-margin))))
+
+  (:advise forward-page :after #'recenter-to-top
+           backward-page :after #'recenter-to-top)
+
+  ;; I'm not sure where this is in /my/ version of Emacs
+  ;; (defvar page-navigation-repeat-map
+  ;;   (let ((map (make-sparse-keymap)))
+  ;;     (define-key map "]" #'forward-page)
+  ;;     (define-key map "[" #'backward-page)
+  ;;     map)
+  ;;   "Keymap to repeat page navigation key sequences.  Used in `repeat-mode'.")
+
+  ;; (put 'forward-page 'repeat-map 'page-navigation-repeat-map)
+  ;; (put 'backward-page 'repeat-map 'page-navigation-repeat-map)
+  )
+
+(setup prog
+  (:option show-paren-delay 0
+           show-paren-style 'mixed
+           show-paren-when-point-inside-paren t
+           show-paren-when-point-in-periphery t
+           smie-indent-basic tab-width)
+  
+  (:hook show-paren-mode
+         electric-pair-local-mode
+         acdw/setup-fringes       
+
+         (defun prog-mode@auto-fill ()
+           (setq-local comment-auto-fill-only-comments t)
+           (turn-on-auto-fill)))
+
+  (add-hook 'after-save-hook
+            #'executable-make-buffer-file-executable-if-script-p))
+
+(setup repeat
+  ;; new for Emacs 28!
+  (:only-if (fboundp #'repeat-mode))
+
+  (:option repeat-exit-key "g"
+           repeat-exit-timeout 5)
+  
+  (repeat-mode +1))
+
+(setup saveplace
+  (:option save-place-file (acdw/dir "places.el")
+           save-place-forget-unreadable-files (acdw/system :home))
+  
+  (save-place-mode +1))
+
+(setup scratch
+  (:option inhibit-startup-screen t
+           initial-buffer-choice t
+           initial-scratch-message ""
+           ;; (concat ";; Howdy, "
+           ;;         (nth 0 (split-string
+           ;;                 user-full-name))
+           ;;         "!  "
+           ;;         "Welcome to GNU Emacs.\n\n")
+           )
+  
+  (add-hook 'kill-buffer-query-functions
+            (defun kill-buffer-query@immortal-scratch ()
+              (if (eq (current-buffer) (get-buffer "*scratch*"))
+                  (progn (bury-buffer)
+                         nil)
+                t))))
+
+(setup scrolling
+  (:option auto-window-vscroll nil
+           fast-but-imprecise-scrolling t
+           scroll-margin 3
+           scroll-conservatively 101
+           scroll-preserve-screen-position 1))
+
+(setup selection
+  (:option save-interprogram-paste-before-kill t
+           yank-pop-change-selection t
+           x-select-enable-clipboard t
+           x-select-enable-primary t
+           mouse-drag-copy-region t
+           kill-do-not-save-duplicates t)
+
+  (delete-selection-mode +1))
+
+(setup sh-mode
+  (:option sh-basic-offset tab-width
+           sh-indent-after-case 0
+           sh-indent-for-case-alt '+
+           sh-indent-for-case-label 0)
+  
+  (:local-set indent-tabs-mode t)
+  
+  (when (executable-find "shfmt")
+    (with-eval-after-load 'apheleia
+      (:option (append apheleia-formatters) '(shfmt . ("shfmt"))
+               (append apheleia-mode-alist) '(sh-mode . shfmt))))
+
+  (when (executable-find "shellcheck")
+    (:straight flymake-shellcheck)
+    (:hook flymake-mode
+           flymake-shellcheck-load)))
+
+(setup shell-command
+  (:option shell-command-switch (acdw/system
+                                 ;; I should be testing on some variable
+                                 (:home "-csi")
+                                 (:work "-c"))
+           shell-command-prompt-show-cwd t
+           shell-command-default-error-buffer "*shell-command-errors*"))
+
+(setup shr
+  (:option shr-width fill-column
+           shr-max-width fill-column
+           shr-max-image-proportion 0.6
+           shr-image-animate t
+           shr-discard-aria-hidden t
+           shr-folding-mode t))
+
+(setup text
+  (:hook turn-on-auto-fill
+         tildify-mode
+         acdw/setup-fringes))
+
+(setup uniquify
+  (:option uniquify-buffer-name-style 'forward
+           uniquify-separator path-separator
+           uniquify-after-kill-buffer-p t
+           uniquify-ignore-buffers-re "^\\*"))
+
+(setup variable-pitch-mode
+  ;; I might want to change this to `buffer-face-mode-hook'...
+  (:advise variable-pitch-mode :after
+           (defun variable-pitch-mode@setup (&rest _)
+             "Set up `variable-pitch-mode' with my customizations."
+             (display-fill-column-indicator-mode
+              (if buffer-face-mode -1 +1)))))
+
+(setup view
+  (:option view-read-only t)
+  
+  (:hook (defun acdw/read-view-mode ()
+           (reading-mode (if view-mode +1 -1)))))
+
+(setup w32
+  (:option w32-allow-system-shell t
+           w32-pass-lwindow-to-system nil
+           w32-lwindow-modifier 'super
+           w32-pass-rwindow-to-system nil
+           w32-rwindow-modifier 'super
+           w32-pass-apps-to-system nil
+           w32-apps-modifier 'hyper))
+
+(setup whitespace
+  (:option  whitespace-style '(empty
+                               indentation
+                               space-before-tab
+                               space-after-tab)
+            indent-tabs-mode nil
+            tab-width 4
+            backward-delete-char-untabify-method 'hungry)
+
+  (:global "M-SPC" #'cycle-spacing))
+
+(setup windmove
+  (:option windmove-wrap-around t)
+  (:global
+   ;; moving
+   "C-x 4 <left>" #'windmove-left
+   "C-x 4 <right>" #'windmove-right
+   "C-x 4 <up>" #'windmove-up
+   "C-x 4 <down>" #'windmove-down
+   ;; swapping
+   "C-x 4 S-<left>" #'windmove-swap-states-left
+   "C-x 4 S-<right>" #'windmove-swap-states-right
+   "C-x 4 S-<up>" #'windmove-swap-states-up
+   "C-x 4 S-<down>" #'windmove-swap-states-down)
+
+  ;; (when (fboundp 'repeat-mode)
+  ;;   (defvar windmove-repeat-map
+  ;;     (let ((map (make-sparse-keymap)))
+  ;;       ;; moving
+  ;;       (define-key map [left] #'windmove-left)
+  ;;       (define-key map [right] #'windmove-right)
+  ;;       (define-key map [up] #'windmove-up)
+  ;;       (define-key map [down] #'windmove-down)
+  ;;       ;; swapping
+  ;;       (define-key map [S-left] #'windmove-swap-states-left)
+  ;;       (define-key map [S-right] #'windmove-swap-states-right)
+  ;;       (define-key map [S-up] #'windmove-swap-states-up)
+  ;;       (define-key map [S-down] #'windmove-swap-states-down)
+  ;;       map)
+  ;;     "Keymap to repeat various `windmove' sequences.  Used in `repeat-mode'.")
+
+  ;;   (dolist (sym '(windmove-left
+  ;;                  windmove-right
+  ;;                  windmove-up
+  ;;                  windmove-down
+  ;;                  windmove-swap-states-left
+  ;;                  windmove-swap-states-right
+  ;;                  windmove-swap-states-up
+  ;;                  windmove-swap-states-down))
+  ;;     (put sym 'repeat-map 'windmove-repeat-map)))
+  )
+
+(setup window
+  (require 'acdw-bell)
+  (:option
+   ;; Man-notify-method 'pushy
+   ;; display-buffer-alist         ; from FrostyX
+   ;; '(("shell.*" (display-buffer-same-window) ())
+   ;;   (".*" (display-buffer-reuse-window
+   ;;          display-buffer-same-window)
+   ;;    (reusable-frames . t)))
+   recenter-positions '(top middle bottom)
+   ring-bell-function (lambda ()
+                        (acdw-bell/flash-mode-line
+                         (acdw/system :home)))
+   use-dialog-box nil
+   use-file-dialog nil
+   visible-bell nil)
+
+  (tooltip-mode -1))
+
+(setup winner
+  ;; see https://lists.gnu.org/archive/html/emacs-devel/2021-08/msg00888.html
+  (:global "C-x 4 C-/" #'winner-undo
+           "C-x 4 /" #'winner-undo
+           "C-x 4 C-?" #'winner-redo
+           "C-x 4 ?" #'winner-redo)
+
+  ;; add `winner-undo' and `winner-redo' to `repeat-mode'
+  ;; (when (fboundp 'repeat-mode)
+  ;;   (defvar winner-mode-repeat-map
+  ;;     (let ((map (make-sparse-keymap)))
+  ;;       (define-key map "/" #'winner-undo)
+  ;;       (define-key map "?" #'winner-redo)
+  ;;       map)
+  ;;     "Keymap to repeat `winner-mode' sequences.  Used in `repeat-mode'.")
+
+  ;;   (put 'winner-undo 'repeat-map 'winner-mode-repeat-map)
+  ;;   (put 'winner-redo 'repeat-map 'winner-mode-repeat-map))
+  
+  (winner-mode +1))
+
+(setup (:straight (0x0
+                   :host gitlab
+                   :repo "willvaughn/emacs-0x0"))
+  (:option 0x0-default-server 'ttm))
+
+(setup (:straight-if affe
+                     (and (or (executable-find "fd")
+                              (executable-find "find"))
+                          (executable-find "rg")))
+  ;; Keys are bound in `acdw/sensible-grep' and `acdw/sensible-find'
+  (:option affe-regexp-compiler
+           (defun affe-orderless-regexp-compiler (input _type)
+             (setq input (orderless-pattern-compiler input))
+             (cons input (lambda (str) (orderless--highlight input str))))))
+
+(setup (:straight-if ahk-mode
+                     (acdw/system :work)))
+
+(setup (:straight alert)
+  (:option alert-default-style (acdw/system
+                                (:home 'libnotify)
+                                (_ 'message))))
+
+(setup (:straight (apheleia
+                   :host github
+                   :repo "raxod502/apheleia"))
+  
+  (apheleia-global-mode +1)
+
+  ;; Use a dumb formatter on modes that `apheleia' doesn't work for.
+  (add-hook 'before-save-hook
+            (defun before-save@dumb-auto-format ()
+              (setq stupid-modes '(makefile-mode
+                                   org-mode))    
+              ;; If there's no apheleia formatter for the mode, just indent the
+              ;; buffer.
+              (unless (or (apply #'derived-mode-p stupid-modes)
+                          (and (fboundp 'apheleia--get-formatter-command)
+                               (apheleia--get-formatter-command)))
+                (indent-region (point-min) (point-max))))))
+
+(setup (:straight async)
+  (dired-async-mode +1)
+
+  (:with-feature dired
+    (:hook (defun dired@disable-dired-async-mode-line ()
+             (autoload 'dired-async--modeline-mode "dired-async" nil t)
+             (dired-async--modeline-mode -1)))))
+
+(setup (:straight avy)
+  (:global "C-'" #'avy-goto-char-timer
+           "C-c C-j" #'avy-resume)
+
+  (:with-feature isearch
+    (:bind "C-'" #'avy-isearch)))
+
 (setup (:straight circe)
   (require 'circe)
   (require 'acdw-irc)
@@ -326,16 +1155,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     
     (:hook #'enable-lui-track)))
 
-(setup completion
-  (:option completion-ignore-case t
-           read-buffer-completion-ignore-case t
-           completion-styles '(substring partial-completion)
-           completion-category-defaults nil
-           completion-category-overrides
-           '((file (styles . (partial-completion)))))
-
-  (:global "M-/" #'hippie-expand))
-
 (setup (:straight (consult
                    :host github
                    :repo "minad/consult"))
@@ -434,57 +1253,9 @@ AKA, DO NOT USE THIS FUNCTION!!!"
 
   (crux-reopen-as-root-mode +1))
 
-(setup cursor
-  (:option cursor-type 'bar
-           cursor-in-non-selected-windows 'hollow
-           blink-cursor-blinks 1)
-  (blink-cursor-mode +1))
-
-(setup cus-edit
-  (:option custom-file null-device      ; don't store customizations
-           custom-magic-show nil
-           custom-magic-show-button t
-           custom-raised-buttons nil
-           custom-unlispify-tag-names nil
-           custom-variable-default-form 'lisp)
-
-  ;; `Custom-mode-hook' fires /before/ the widgets are built, so I have to
-  ;; install advice after the widgets are made.
-  (:advise custom-buffer-create :after
-           (defun custom-buffer@expand-widgets (&rest _)
-             "Expand descriptions in `Custom-mode' buffers."
-             (interactive)
-             ;; "More/Hide" widgets (thanks alphapapa!)
-             (widget-map-buttons (lambda (widget _)
-                                   (pcase (widget-get widget :off)
-                                     ("More" (widget-apply-action widget)))
-                                   nil))
-             ;; "Show Value" widgets (the little triangles)
-             (widget-map-buttons (lambda (widget _)
-                                   (pcase (widget-get widget :off)
-                                     ("Show Value"
-                                      (widget-apply-action widget)))
-                                   nil))))
-
-  (:with-mode Custom-mode
-    (:local-set imenu-generic-expression ; thanks u/oantolin!
-                '(("Faces" (rx (seq bol
-                                    (or "Show" "Hide") " "
-                                    (group (zero-or-more nonl))
-                                    " face: [sample]"))
-                   1)
-                  ("Variables" (rx (seq bol
-                                        (or "Show Value" "Hide") " "
-                                        (group (zero-or-more
-                                                (not (any "\n:"))))))
-                   1)))))
-
-(setup debugger
-  (:hook visual-line-mode))
-
 (setup (:straight-if (define-repeat-map
-                                   :host nil
-                                   :repo "https://tildegit.org/acdw/define-repeat-map.el")
+                                     :host nil
+                                     :repo "https://tildegit.org/acdw/define-repeat-map.el")
                      (acdw/system :home))
 
   (defun acdw/other-window-or-switch-buffer-backward ()
@@ -526,97 +1297,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     ("/" winner-undo
      "?" winner-redo)))
 
-(setup dired
-  (:also-load dired-x)
-  (:straight dired-subtree
-             dired-collapse
-             dired-git-info)
-  
-  (:option dired-recursive-copies 'always
-           dired-recursive-deletes 'always
-           delete-by-moving-to-trash t
-           dired-listing-switches "-Al"
-           ls-lisp-dirs-first t
-           dired-ls-F-marks-symlinks t
-           dired-no-confirm '(byte-compile
-                              chgrp chmod chown copy
-                              hardlink load move
-                              shell touch symlink)
-           dired-dwim-target t)
-
-  (:bind "TAB" #'dired-subtree-cycle
-         "i" #'dired-subtree-toggle
-         ")" #'dired-git-info-mode)
-
-  (:hook dired-collapse-mode
-         dired-hide-details-mode
-         hl-line-mode)
-  
-  (:global "C-x C-j" #'dired-jump)
-
-  (with-eval-after-load 'dired
-    (acdw/system
-     (:work (:straight w32-browser)
-            (autoload #'dired-w32-browser "w32-browser" nil t)
-            (:bind "RET" #'dired-w32-browser))
-     (:home (:straight dired-open)
-            (autoload #'dired-find-alternate-file "dired-open" nil t)
-            (:bind "RET" #'dired-find-alternate-file)))))
-
-(setup disabled
-  ;; While this stuff is defined in novice.el, I'm using 'disabled' as the name
-  ;; for easy finding.
-
-  ;; Enable all disabled commands.
-  ;; This is an option, but I'm going to try /enabling/ just the ones that I
-  ;; use instead.
-  ;; (mapatoms (lambda (symbol)
-  ;;             (when (get symbol 'disabled)
-  ;;               (put symbol 'disabled nil))))
-
-  ;; Enable /some/ disabled commands
-  (dolist (enable-sym '(narrow-to-region
-                        dired-find-alternate-file
-                        narrow-to-page))
-    (put enable-sym 'disabled nil))
-  
-  ;; Now, disable symbols as I wish.
-  (dolist (disable-sym '(view-hello-file
-                         suspend-frame
-                         scroll-left
-                         scroll-right
-                         comment-set-column
-                         set-fill-column))
-    (put disable-sym 'disabled t))
-  
-  ;; And set the disabled function to something better than the default.
-  ;; Now, I can run any disabled command, but I have to use M-x to do it.
-  (setq disabled-command-function
-        (defun acdw/disabled-command-function (&optional cmd keys)
-          (let ((cmd (or cmd this-command))
-                (keys (or keys (this-command-keys))))
-            ;; this logic stolen from original `disabled-command-function'
-            (if (or (eq (aref keys 0) (if (stringp keys)
-                                          (aref "\M-x" 0)
-                                        ?\M-x))
-                    (and (>= (length keys) 2)
-                         (eq (aref keys 0) meta-prefix-char)
-                         (eq (aref keys 1) ?x)))
-                ;; it's been run as an M-x command, we want to do it
-                (call-interactively cmd)
-              ;; else, tell the user it's disabled.
-              (message (substitute-command-keys
-                        (concat "Command `%s' has been disabled.  "
-                                "Run with \\[execute-extended-command]."))
-                       cmd))))))
-
-(setup ediff
-  (:option ediff-diff-options "-w" ; ignore whitespace
-           ediff-window-setup-function #'ediff-setup-windows-plain
-           ediff-split-window-function #'split-window-horizontally)
-  ;; https://oremacs.com/2015/01/17/setting-up-ediff/
-  (add-hook 'ediff-after-quit-hook-internal #'winner-undo))
-
 (setup (:straight edit-indirect))
 
 ;; requires extension:
@@ -637,10 +1317,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
            (defun edit-server@set-a-variable (&rest _)
              (setq-local edit-server-frame-p t))))
 
-(setup eldoc
-  (:option eldoc-idle-delay 0.1
-           eldoc-echo-area-use-multiline-p nil))
-
 (setup (:straight (electric-cursor
                    :host github
                    :repo "duckwork/electric-cursor"))
@@ -681,39 +1357,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                            (scroll-down-command arg)
                          (error (elfeed-show-prev))))))))
 
-(setup elisp-mode
-  (:with-mode emacs-lisp-mode ;; -_-
-    (:option eval-expression-print-length nil
-             eval-expression-print-level nil
-             lisp-indent-function #'lisp-indent-function)
-
-    (:local-set (append imenu-generic-expression)
-                `("Setup"
-                  ,(rx (seq
-                        (group bol (* space) "(setup" (+ space))
-                        (? (group "(:" (+ graph) (* space) (? "(")))
-                        (group (+ (any word ?-)))))
-                  3))
-
-    (:hook #'checkdoc-minor-mode
-           #'turn-on-eldoc-mode)
-
-    ;; Emulate slime's eval binds
-    (:bind "C-c C-c" #'eval-defun
-           "C-c C-k" #'acdw/eval-region-or-buffer
-           "C-c C-z" #'ielm)
-    
-    ;; Add advice to pulse evaluated regions
-    (:advise eval-region :around
-             (defun eval-region@pulse (fn beg end &rest args)
-               (pulse-momentary-highlight-region beg end)
-               (apply fn beg end args))))
-
-  (:with-mode lisp-interaction-mode ;; -___-
-    (:bind "C-c C-c" #'eval-defun
-           "C-c C-k" #'acdw/eval-region-or-buffer
-           "C-c C-z" #'ielm)))
-
 (setup (:straight elisp-slime-nav)
   (:hook-into emacs-lisp-mode
               ielm-mode))
@@ -743,70 +1386,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   ;; (t (apply fn url args))))
   )
 
-(setup emacs
-  ;; "Et cetera" settings
-  ;; This should stay as /minimal/ as possible.  Anything that can go somewhere
-  ;; else /should/ go there.
-  (:option
-   attempt-orderly-shutdown-on-fatal-signal nil
-   attempt-stack-overflow-recovery nil
-   echo-keystrokes 0.01
-   find-function-C-source-directory (acdw/find-emacs-source)
-   kill-read-only-ok t
-   load-prefer-newer t
-   native-comp-async-report-warnings-errors nil
-   password-cache t
-   password-cache-expiry 3600           ; 5 minutes
-   set-mark-command-repeat-pop t)
-
-  (when (fboundp 'command-completion-default-include-p)
-    (setq read-extended-command-predicate
-          #'command-completion-default-include-p))
-
-  (defvar case-map (make-sparse-keymap)
-    "A keymap for setting case in various ways.")
-  (global-set-key (kbd "C-c c") case-map)
-
-  (defvar lookup-map (make-sparse-keymap)
-    "A keymap for looking up things.")
-  (global-set-key (kbd "C-c l") lookup-map)
-
-  (defvar toggle-map (make-sparse-keymap)
-    "A keymap for toggling!")
-  (global-set-key (kbd "C-c t") toggle-map)
-
-  (:global "M-=" #'count-words
-           "C-w" #'kill-region-or-backward-word
-           "C-c d" #'acdw/insert-iso-date
-           "M-`" nil
-           "C-x o" #'acdw/other-window-or-switch-buffer
-           "C-x O" #'acdw/other-window-or-switch-buffer-backward
-           "C-c _" #'add-file-local-variable
-           "C-x C-c" #'acdw/fat-finger-exit)
-
-  (:with-map toggle-map
-    (:bind "c" #'column-number-mode
-           "l" #'display-line-numbers-mode
-           "d" #'toggle-debug-on-error))
-
-  (:with-map case-map
-    (require 'titlecase)
-    (:bind "c" #'capitalize-dwim
-           "t" #'titlecase-dwim
-           "u" #'upcase-dwim
-           "l" #'downcase-dwim
-           "s" (defun studlify-dwim (count)
-                 "Studlify region if active, or COUNT words if not."
-                 (interactive "*p")
-                 (if (region-active-p)
-                     (studlify-region (region-beginning) (region-end))
-                   (studlify-word count)))))
-  
-  (add-hook 'after-make-frame-functions
-            (defun after-make-frame@maximize (frame)
-              (unless (bound-and-true-p edit-server-frame-p)
-                (toggle-frame-maximized frame)))))
-
 (setup (:straight embark)
   (:global "C-." #'embark-act)
   (:option prefix-help-command #'embark-prefix-help-command
@@ -830,30 +1409,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     (add-hook 'embark-collect-mode-hook
               #'consult-preview-at-point-mode)))
 
-(setup encoding
-  (:option locale-coding-system 'utf-8-unix
-           coding-system-for-read 'utf-8-unix
-           coding-system-for-write 'utf-8-unix
-           buffer-file-coding-system 'utf-8-unix
-           default-process-coding-system '(utf-8-unix . utf-8-unix)
-           x-select-request-type '(UTF8_STRING
-                                   COMPOUND_TEXT
-                                   TEXT
-                                   STRING))
-
-  (set-charset-priority 'unicode)
-  (set-language-environment "UTF-8")
-  (prefer-coding-system 'utf-8-unix)
-  (set-default-coding-systems 'utf-8-unix)
-  (set-terminal-coding-system 'utf-8-unix)
-  (set-keyboard-coding-system 'utf-8-unix)
-
-  (acdw/system
-   (:work (set-clipboard-coding-system 'utf-16-le)
-          (set-selection-coding-system 'utf-16-le))
-   (_ (set-selection-coding-system 'utf-8)
-      (set-clipboard-coding-system 'utf-8))))
-
 (setup (:straight epithet)
   (dolist (hook '(Info-selection-hook
                   eww-after-render-hook
@@ -905,52 +1460,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (:hook-into emacs-lisp-mode
               lisp-interaction-mode))
 
-(setup eshell
-  (:also-load acdw-eshell
-              em-smart
-              em-tramp)
-
-  (:option eshell-aliases-file (acdw/dir "eshell/aliases" t)
-           eshell-destroy-buffer-when-process-dies t
-           eshell-directory-name (acdw/dir "eshell/" t)
-           eshell-error-if-no-glob t
-           eshell-hist-ignore-dups t
-           eshell-kill-on-exit nil
-           eshell-prefer-lisp-functions t ; I want to try using eshell
-           eshell-prefer-lisp-variables t ; as much as possible.
-           eshell-review-quick-commands nil
-           eshell-save-history-on-exit t
-           eshell-scroll-to-bottom-on-input 'all
-           eshell-smart-space-goes-to-end t
-           eshell-where-to-jump 'begin)
-
-  (:local-set outline-regexp eshell-prompt-regexp
-              page-delimiter eshell-prompt-regexp)
-
-  (:bind "C-d" #'eshell-quit-or-delete-char)
-
-  (:hook #'eshell-arg-hist-mode
-         (defun eshell-mode@setup ()
-           (unless (bound-and-true-p eshell-customizations-loaded)
-             (load (expand-file-name "eshell" user-emacs-directory))))))
-
-(setup eww
-  (defvar-local eww-readable-p nil
-    "Whether current buffer is in readable-mode.")
-  (:option eww-search-prefix "https://duckduckgo.com/html?q="
-           url-privacy-level '(email agent cookies lastloc))
-
-  (defun eww@is-readable (&rest _)
-    (setq-local eww-readable-p t))
-  (defun eww@is-not-readable (&rest _)
-    (setq-local eww-readable-p nil))
-  
-  (advice-add 'eww-readable :after #'eww@is-readable)
-  (advice-add 'eww-render :after #'eww@is-not-readable)
-  (advice-add 'eww-back-url :after #'eww@is-not-readable)
-  
-  (:hook #'reading-mode))
-
 (setup (:straight-if exec-path-from-shell
                      (acdw/system :home))
   (when (daemonp)
@@ -964,87 +1473,6 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (:autoload (fennel-repl :interactive t))
   (:file-match (rx ".fnl" eos)))
 
-(setup files
-  (:option
-   auto-save-file-name-transforms `((".*" ,(acdw/dir "auto-save/" t) t))
-   auto-save-list-file-prefix (acdw/dir "auto-save-list/.saves-" t)
-   auto-save-interval 60
-   auto-save-timeout 60
-   auto-save-visited-interval auto-save-timeout
-   backup-by-copying t
-   backup-directory-alist `((".*" . ,(acdw/dir "backup/" t)))
-   delete-old-versions t
-   mode-require-final-newline 'visit-save
-   tramp-backup-directory-alist backup-directory-alist
-   vc-make-backup-files t
-   version-control t)
-
-  (auto-save-visited-mode +1))
-
-(setup find-func
-  (:global "C-c l f" #'find-function
-           "C-c l l" #'find-library
-           "C-c l v" #'find-variable))
-
-(setup flymake
-
-  (defvar-local flymake-inhibit nil
-    "Buffer-local variable to inhibit `flymake'.")
-  (add-to-list 'safe-local-variable-values '(flymake-inhibit . t))
-  (add-to-list 'safe-local-variable-values '(flymake-inhibit . nil))
-
-  (defvar flymake-inhibit-major-modes nil
-    "Which major-modes NOT to enable `flymake' in.")
-
-  (defvar flymake-inhibit-file-name-regexps '("init\\.el\\'"
-                                              "early-init\\.el\\'")
-    "List of file regexps NOT to enable `flymake' in.")
-
-  (defvar flymake-inhibit-buffer-name-regexps (list (rx "*scratch*"))
-    "List of buffer-name regexps NOT to enable `flymake' in.")
-
-  (defun list-string-match-p (string regexp-list)
-    "Return t if at least one regex in RETGEXP-LIST matches STRING, else nil."
-    (when string                        ; if STRING is nil, return nil.
-      (catch 'found
-        (dolist (regexp regexp-list)
-          (when (string-match regexp string)
-            (throw 'found t))))))
-
-  (defun flymake-unless ()
-    "Turn on `flymake-mode', UNLESS it's inhibited.
-There are three methods to inhibit flymake in a file.  From most
-specific to most general, they are these:
-
-- `flymake-inhibit': a file-local-variable
-
-- `flymake-inhibit-buffer-name-regexps': a list of regexps to
-  match the buffer name against.  If one of them matches, inhibit
-  `flymake-mode'.
-
-- `flymake-inhibit-file-name-regexps': a list of regexps to match
-  the filename against.  If one of them matches, inhibit
-  `flymake-mode'.
-
-- `flymake-inhibit-major-modes': a list of major-modes in which
-  to inhibit `flymake-mode'.  Really only useful if you want to
-  generally add `flymake-mode' to `prog-mode-hook'."
-    (unless (or (bound-and-true-p flymake-inhibit) ; file-local variable
-                (list-string-match-p (buffer-name)
-                                     flymake-inhibit-buffer-name-regexps)
-                (list-string-match-p (buffer-file-name)
-                                     flymake-inhibit-file-name-regexps)
-                (apply #'derived-mode-p flymake-inhibit-major-modes))
-      (flymake-mode-on)))
-
-  (add-hook 'prog-mode-hook #'flymake-unless)
-  
-  (:bind "M-n" #'flymake-goto-next-error
-         "M-p" #'flymake-goto-prev-error))
-
-(setup flyspell
-  (:hook-into text-mode))
-
 (setup (:straight flyspell-correct)
   (:option flyspell-correct-interface #'flyspell-correct-completing-read
            flyspell-correct--cr-key ";")
@@ -1070,16 +1498,6 @@ specific to most general, they are these:
                  '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
                    forge-gitea-repository))))
 
-(setup frames
-  (:option frame-title-format '("%b@"
-                                (:eval
-                                 (or (file-remote-p default-directory 'host)
-                                     system-name))
-                                " %+%* GNU Emacs"
-                                (:eval (when (frame-parameter nil 'client)
-                                         " Client")))
-           window-resize-pixelwise t))
-
 (setup (:straight gcmh)
   (:option gcmh-idle-delay 'auto)
   (gcmh-mode +1))
@@ -1120,23 +1538,12 @@ specific to most general, they are these:
   (with-eval-after-load 'elpher
     (require 'gemini-write)))
 
-(setup (:require gforth)
-  (:autoload forth-mode
-             forth-block-mode)
-  (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
-  (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
-
 (setup (:straight gitattributes-mode))
 
 (setup (:straight gitconfig-mode))
 
 (setup (:straight gitignore-mode))
 
-(setup (:require goto-addr)
-  (if (fboundp #'global-goto-address-mode)
-      (global-goto-address-mode)
-    (add-hook 'after-change-major-mode-hook #'goto-address-mode)))
-
 (setup (:straight helpful)
   (:require-after 3)
   
@@ -1187,62 +1594,12 @@ specific to most general, they are these:
                  (hungry-delete-forward (or arg 1))
                (paredit-forward-delete arg))))))
 
-(setup ibuffer
-  (:also-load ibuf-ext)
-  (:option ibuffer-expert t
-           ibuffer-show-empty-filter-groups nil
-           ibuffer-saved-filter-groups
-           '(("default"
-              ("dired" (mode . dired-mode))
-              ("customize" (mode . Custom-mode))
-              ("emacs" (or (name . "^\\*scratch\\*$")
-                           (name . "^\\*Messages\\*$")
-                           (name . "^\\*Warnings\\*$")
-                           (name . "^\\*straight-process\\*$")
-                           (name . "^\\*Calendar\\*$")))
-              ("git" (or (name . "^\*magit")
-                         (name . "^\magit")))
-              ("help" (or (mode . help-mode)
-                          (mode . Info-mode)
-                          (mode . helpful-mode)))
-              ("messaging" (or (mode . message-mode)
-                               (mode . bbdb-mode)
-                               (mode . mail-mode)
-                               (mode . gnus-group-mode)
-                               (mode . gnus-summary-mode)
-                               (mode . gnus-article-mode)
-                               (name . "^\\.bbdb$")
-                               (name . "^\\.newsrc-dribble")
-                               (mode . erc-mode)
-                               (mode . circe-server-mode)
-                               (mode . circe-channel-mode)))
-              ("shell" (or (mode . eshell-mode)
-                           (mode . shell-mode)
-                           (mode . vterm-mode)))
-              ("web" (or (mode . elpher-mode)
-                         (mode . gemini-mode)
-                         (mode . eww-mode))))))
-
-  (:global "C-x C-b" #'ibuffer)
-
-  (:hook (defun ibuffer@filter-to-default ()
-           (ibuffer-switch-to-saved-filter-groups "default"))))
-
-(setup ielm
-  (:hook #'turn-on-eldoc-mode))
-
-(setup imenu
-  (:option imenu-auto-rescan t))
-
 (setup (:straight iscroll)
   (define-globalized-minor-mode global-iscroll-mode iscroll-mode
     (lambda () (iscroll-mode +1)))
 
   (global-iscroll-mode +1))
 
-(setup isearch
-  (:option search-default-mode t))
-
 (setup (:straight (kaomoji-insert
                    :host nil
                    :repo "https://tildegit.org/acdw/kaomoji-insert"))
@@ -1262,29 +1619,6 @@ specific to most general, they are these:
 (setup (:straight-if ledger-mode
                      (executable-find "ledger")))
 
-(setup lines
-  (:option fill-column 79
-           word-wrap t
-           truncate-lines nil)
-
-  (global-display-fill-column-indicator-mode +1)
-  (global-so-long-mode +1)
-
-  (add-hook 'visual-line-mode-hook
-            (defun acdw/disable-fill-column-indicator ()
-              (display-fill-column-indicator-mode
-               (if visual-line-mode -1 +1))))
-
-  ;; `acdw/kill-line-and-join-advice' cribs from `crux-kill-and-join-forward'.
-  ;; I can't simply advise `kill-line' with an override from crux because crux
-  ;; itself calls `kill-line', leading to a infinite nesting situation.
-  (advice-add 'kill-line :around
-              (defun kill-line@join (fn &rest args)
-                (if (and (eolp)
-                         (not (bolp)))
-                    (delete-indentation 1)
-                  (apply fn args)))))
-
 (setup (:straight link-hint)
   ;; Browse web URLs with a browser with a prefix argument.
   (dolist (type '(gnus-w3m-image-url
@@ -1369,29 +1703,6 @@ browser defined in `browse-url-secondary-browser-function'."
   (:hook #'hl-line-mode
          #'reading-mode))
 
-(setup minibuffer
-  (:option enable-recursive-minibuffers t
-           file-name-shadow-properties '(invisible t intangible t)
-           minibuffer-eldef-shorten-default t
-           minibuffer-prompt-properties
-           '(read-only t cursor-intangible t face minibuffer-prompt)
-           read-answer-short t
-           read-extended-command-predicate ; used on >28
-           #'command-completion-default-include-p)
-
-  (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
-  
-  (add-hook 'minibuffer-setup-hook #'acdw/gc-disable)
-  (add-hook 'minibuffer-exit-hook #'acdw/gc-enable)
-  
-  (minibuffer-depth-indicate-mode +1)
-  (file-name-shadow-mode +1)
-  (minibuffer-electric-default-mode +1)
-
-  (if (version< emacs-version "28")
-      (fset 'yes-or-no-p #'y-or-n-p)
-    (setq use-short-answers t)))
-
 (setup (:straight (modus-themes
                    :host gitlab
                    :repo "protesilaos/modus-themes"))
@@ -1406,9 +1717,6 @@ browser defined in `browse-url-secondary-browser-function'."
   (acdw/sunrise-sunset #'modus-themes-load-operandi
                        #'modus-themes-load-vivendi))
 
-(setup mouse-avoidance
-  (mouse-avoidance-mode 'exile))
-
 (setup (:straight mwim)
   (:global "C-a" #'mwim-beginning
            "C-e" #'mwim-end))
@@ -1572,35 +1880,6 @@ browser defined in `browse-url-secondary-browser-function'."
 
 (setup (:straight package-lint-flymake))
 
-(setup page
-  (:option page-delimiter
-           (rx bol (or "\f" ";;;")
-               (not (any "#")) (* not-newline) "\n"
-               (* (* blank) (opt ";" (* not-newline)) "\n")))
-  
-  (defun recenter-to-top (&rest _)
-    "Recenter the cursor to the top of the window."
-    (when (called-interactively-p 'any)
-      (recenter (if (or (null scroll-margin)
-                        (zerop scroll-margin))
-                    3
-                  scroll-margin))))
-
-  (:advise forward-page :after #'recenter-to-top
-           backward-page :after #'recenter-to-top)
-
-  ;; I'm not sure where this is in /my/ version of Emacs
-  ;; (defvar page-navigation-repeat-map
-  ;;   (let ((map (make-sparse-keymap)))
-  ;;     (define-key map "]" #'forward-page)
-  ;;     (define-key map "[" #'backward-page)
-  ;;     map)
-  ;;   "Keymap to repeat page navigation key sequences.  Used in `repeat-mode'.")
-
-  ;; (put 'forward-page 'repeat-map 'page-navigation-repeat-map)
-  ;; (put 'backward-page 'repeat-map 'page-navigation-repeat-map)
-  )
-
 (setup (:straight page-break-lines)
   (global-page-break-lines-mode +1))
 
@@ -1658,44 +1937,6 @@ browser defined in `browse-url-secondary-browser-function'."
   (dolist (mode lispy-modes)
     (add-hook (intern (format "%s-hook" mode)) #'prism-mode)))
 
-(setup prog
-  (:option show-paren-delay 0
-           show-paren-style 'mixed
-           show-paren-when-point-inside-paren t
-           show-paren-when-point-in-periphery t
-           smie-indent-basic tab-width)
-  
-  (:hook show-paren-mode
-         electric-pair-local-mode
-         acdw/setup-fringes       
-
-         (defun prog-mode@auto-fill ()
-           (setq-local comment-auto-fill-only-comments t)
-           (turn-on-auto-fill)))
-
-  (add-hook 'after-save-hook
-            #'executable-make-buffer-file-executable-if-script-p))
-
-(setup (:require recentf)
-  (:option recentf-save-file (acdw/dir "recentf.el")
-           recentf-max-menu-items 100
-           recentf-max-saved-items nil
-           recentf-auto-cleanup 'mode
-           (append recentf-exclude) (acdw/dir))
-
-  (:advise dired-rename-file :after #'rjs/recentf-rename-notify)
-  
-  (recentf-mode +1))
-
-(setup repeat
-  ;; new for Emacs 28!
-  (:only-if (fboundp #'repeat-mode))
-
-  (:option repeat-exit-key "g"
-           repeat-exit-timeout 5)
-  
-  (repeat-mode +1))
-
 (setup (:straight restart-emacs)
   (defun emacs-upgrade (&optional update-packages)
     "Pull config, upgrade packages, restart Emacs."
@@ -1706,93 +1947,6 @@ browser defined in `browse-url-secondary-browser-function'."
       (straight-x-pull-all))
     (restart-emacs)))
 
-(setup (:require savehist)
-  (:option history-length t
-           history-delete-duplicates t
-           savehist-autosave-interval 60
-           savehist-file (acdw/dir "savehist.el"))
-
-  (dolist (var '(extended-command-history
-                 global-mark-ring
-                 kill-ring
-                 regexp-search-ring
-                 search-ring
-                 mark-ring))
-    (:option (append savehist-additional-variables) var))
-  
-  (savehist-mode +1))
-
-(setup saveplace
-  (:option save-place-file (acdw/dir "places.el")
-           save-place-forget-unreadable-files (acdw/system :home))
-  
-  (save-place-mode +1))
-
-(setup scratch
-  (:option inhibit-startup-screen t
-           initial-buffer-choice t
-           initial-scratch-message ""
-           ;; (concat ";; Howdy, "
-           ;;         (nth 0 (split-string
-           ;;                 user-full-name))
-           ;;         "!  "
-           ;;         "Welcome to GNU Emacs.\n\n")
-           )
-  
-  (add-hook 'kill-buffer-query-functions
-            (defun kill-buffer-query@immortal-scratch ()
-              (if (eq (current-buffer) (get-buffer "*scratch*"))
-                  (progn (bury-buffer)
-                         nil)
-                t))))
-
-(setup scrolling
-  (:option auto-window-vscroll nil
-           fast-but-imprecise-scrolling t
-           scroll-margin 3
-           scroll-conservatively 101
-           scroll-preserve-screen-position 1))
-
-(setup selection
-  (:option save-interprogram-paste-before-kill t
-           yank-pop-change-selection t
-           x-select-enable-clipboard t
-           x-select-enable-primary t
-           mouse-drag-copy-region t
-           kill-do-not-save-duplicates t)
-
-  (delete-selection-mode +1))
-
-(setup (:require server)
-  (unless (server-running-p)
-    (server-start)))
-
-(setup sh-mode
-  (:option sh-basic-offset tab-width
-           sh-indent-after-case 0
-           sh-indent-for-case-alt '+
-           sh-indent-for-case-label 0)
-  
-  (:local-set indent-tabs-mode t)
-  
-  (when (executable-find "shfmt")
-    (with-eval-after-load 'apheleia
-      (:option (append apheleia-formatters) '(shfmt . ("shfmt"))
-               (append apheleia-mode-alist) '(sh-mode . shfmt))))
-
-  (when (executable-find "shellcheck")
-    (:straight flymake-shellcheck)
-    (:hook flymake-mode
-           flymake-shellcheck-load)))
-
-(setup shell-command
-  (:option shell-command-switch (acdw/system
-                                 ;; I should be testing on some variable
-                                 (:home "-csi")
-                                 (:work "-c"))
-           shell-command-prompt-show-cwd t
-           shell-command-default-error-buffer "*shell-command-errors*"))
-
 (setup (:straight (shell-command+
                    :host nil
                    :repo "https://git.sr.ht/~pkal/shell-command-plus"))
@@ -1801,14 +1955,6 @@ browser defined in `browse-url-secondary-browser-function'."
     (:bind "M-!" shell-command+))
   (:global "M-!" shell-command+))
 
-(setup shr
-  (:option shr-width fill-column
-           shr-max-width fill-column
-           shr-max-image-proportion 0.6
-           shr-image-animate t
-           shr-discard-aria-hidden t
-           shr-folding-mode t))
-
 (setup (:straight simple-modeline
                   minions)
   (:also-load acdw-modeline)
@@ -1897,11 +2043,6 @@ browser defined in `browse-url-secondary-browser-function'."
 (setup (:straight-if systemd
                      (executable-find "systemd")))
 
-(setup text
-  (:hook turn-on-auto-fill
-         tildify-mode
-         acdw/setup-fringes))
-
 (setup (:straight (topsy
                    :host github
                    :repo "alphapapa/topsy.el"))
@@ -1965,20 +2106,6 @@ If used with a numeric prefix argument N, N backticks will be inserted."
              (save-some-buffers t))
            #'garbage-collect)))
 
-(setup uniquify
-  (:option uniquify-buffer-name-style 'forward
-           uniquify-separator path-separator
-           uniquify-after-kill-buffer-p t
-           uniquify-ignore-buffers-re "^\\*"))
-
-(setup variable-pitch-mode
-  ;; I might want to change this to `buffer-face-mode-hook'...
-  (:advise variable-pitch-mode :after
-           (defun variable-pitch-mode@setup (&rest _)
-             "Set up `variable-pitch-mode' with my customizations."
-             (display-fill-column-indicator-mode
-              (if buffer-face-mode -1 +1)))))
-
 (setup (:straight (vertico
                    :host github
                    :repo "minad/vertico"
@@ -2016,12 +2143,6 @@ If used with a numeric prefix argument N, N backticks will be inserted."
                        "  ")
                      cand))))
 
-(setup view
-  (:option view-read-only t)
-  
-  (:hook (defun acdw/read-view-mode ()
-           (reading-mode (if view-mode +1 -1)))))
-
 (setup (:straight visual-regexp)
   (:global "M-%" #'vr/query-replace))
 
@@ -2033,15 +2154,6 @@ If used with a numeric prefix argument N, N backticks will be inserted."
   (eshell-vterm-mode +1)
   (defalias 'eshell/v 'eshell-exec-visual))
 
-(setup w32
-  (:option w32-allow-system-shell t
-           w32-pass-lwindow-to-system nil
-           w32-lwindow-modifier 'super
-           w32-pass-rwindow-to-system nil
-           w32-rwindow-modifier 'super
-           w32-pass-apps-to-system nil
-           w32-apps-modifier 'hyper))
-
 (setup (:straight wc-mode)
   (:option wc-modeline-format "[%tww]"
            wc-idle-wait 2)
@@ -2072,101 +2184,9 @@ If used with a numeric prefix argument N, N backticks will be inserted."
   (which-key-setup-side-window-right-bottom)
   (which-key-mode +1))
 
-(setup whitespace
-  (:option  whitespace-style '(empty
-                               indentation
-                               space-before-tab
-                               space-after-tab)
-            indent-tabs-mode nil
-            tab-width 4
-            backward-delete-char-untabify-method 'hungry)
-
-  (:global "M-SPC" #'cycle-spacing))
-
 (setup (:straight whitespace-cleanup-mode)
   (global-whitespace-cleanup-mode +1))
 
-(setup windmove
-  (:option windmove-wrap-around t)
-  (:global
-   ;; moving
-   "C-x 4 <left>" #'windmove-left
-   "C-x 4 <right>" #'windmove-right
-   "C-x 4 <up>" #'windmove-up
-   "C-x 4 <down>" #'windmove-down
-   ;; swapping
-   "C-x 4 S-<left>" #'windmove-swap-states-left
-   "C-x 4 S-<right>" #'windmove-swap-states-right
-   "C-x 4 S-<up>" #'windmove-swap-states-up
-   "C-x 4 S-<down>" #'windmove-swap-states-down)
-
-  ;; (when (fboundp 'repeat-mode)
-  ;;   (defvar windmove-repeat-map
-  ;;     (let ((map (make-sparse-keymap)))
-  ;;       ;; moving
-  ;;       (define-key map [left] #'windmove-left)
-  ;;       (define-key map [right] #'windmove-right)
-  ;;       (define-key map [up] #'windmove-up)
-  ;;       (define-key map [down] #'windmove-down)
-  ;;       ;; swapping
-  ;;       (define-key map [S-left] #'windmove-swap-states-left)
-  ;;       (define-key map [S-right] #'windmove-swap-states-right)
-  ;;       (define-key map [S-up] #'windmove-swap-states-up)
-  ;;       (define-key map [S-down] #'windmove-swap-states-down)
-  ;;       map)
-  ;;     "Keymap to repeat various `windmove' sequences.  Used in `repeat-mode'.")
-
-  ;;   (dolist (sym '(windmove-left
-  ;;                  windmove-right
-  ;;                  windmove-up
-  ;;                  windmove-down
-  ;;                  windmove-swap-states-left
-  ;;                  windmove-swap-states-right
-  ;;                  windmove-swap-states-up
-  ;;                  windmove-swap-states-down))
-  ;;     (put sym 'repeat-map 'windmove-repeat-map)))
-  )
-
-(setup window
-  (require 'acdw-bell)
-  (:option
-   ;; Man-notify-method 'pushy
-   ;; display-buffer-alist         ; from FrostyX
-   ;; '(("shell.*" (display-buffer-same-window) ())
-   ;;   (".*" (display-buffer-reuse-window
-   ;;          display-buffer-same-window)
-   ;;    (reusable-frames . t)))
-   recenter-positions '(top middle bottom)
-   ring-bell-function (lambda ()
-                        (acdw-bell/flash-mode-line
-                         (acdw/system :home)))
-   use-dialog-box nil
-   use-file-dialog nil
-   visible-bell nil)
-
-  (tooltip-mode -1))
-
-(setup winner
-  ;; see https://lists.gnu.org/archive/html/emacs-devel/2021-08/msg00888.html
-  (:global "C-x 4 C-/" #'winner-undo
-           "C-x 4 /" #'winner-undo
-           "C-x 4 C-?" #'winner-redo
-           "C-x 4 ?" #'winner-redo)
-
-  ;; add `winner-undo' and `winner-redo' to `repeat-mode'
-  ;; (when (fboundp 'repeat-mode)
-  ;;   (defvar winner-mode-repeat-map
-  ;;     (let ((map (make-sparse-keymap)))
-  ;;       (define-key map "/" #'winner-undo)
-  ;;       (define-key map "?" #'winner-redo)
-  ;;       map)
-  ;;     "Keymap to repeat `winner-mode' sequences.  Used in `repeat-mode'.")
-
-  ;;   (put 'winner-undo 'repeat-map 'winner-mode-repeat-map)
-  ;;   (put 'winner-redo 'repeat-map 'winner-mode-repeat-map))
-  
-  (winner-mode +1))
-
 (setup (:straight winum)
   (:option winum-scope 'frame-local
            winum-auto-setup-mode-line nil
@@ -265,10 +265,16 @@ With a prefix argument N, (un)comment that many sexps."
 ;; from https://github.com/alphapapa/unpackaged.el#sort-sexps
 ;; and https://github.com/alphapapa/unpackaged.el/issues/20
 
-(defun sort-sexps (beg end &optional key)
+(defun sort-sexps (beg end &optional key-fn sort-fn)
   "Sort sexps between BEG and END.
-Comments stay with the code below.  KEY is a function to sort by,
-e.g. (lambda (sexp) (symbol-name (car sexp)))"
+Comments stay with the code below.
+
+Optional argument KEY-FN will determine where in each sexp to
+start sorting.  e.g. (lambda (sexp) (symbol-name (car sexp)))
+
+Optional argument SORT-FN will determine how to sort two sexps'
+strings.  It's passed to `sort'.  By default, it sorts the sexps
+with `string<' starting with the key determined by KEY-FN."
   (interactive "r")
   (cl-flet ((skip-whitespace () (while (looking-at (rx (1+ (or space "\n"))))
                                   (goto-char (match-end 0))))
@@ -298,8 +304,8 @@ e.g. (lambda (sexp) (symbol-name (car sexp)))"
                                    (save-excursion
                                      (goto-char (marker-position start))
                                      (skip-both)
-                                     (if key
-                                         (funcall key sexp)
+                                     (if key-fn
+                                         (funcall key-fn sexp)
                                        (buffer-substring
                                         (point)
                                         (marker-position end)))))
@@ -307,8 +313,9 @@ e.g. (lambda (sexp) (symbol-name (car sexp)))"
                      collect (cons start end)
                      into markers
                      finally return (list sexps markers))
-          (setq sexps (sort sexps (lambda (a b)
-                                    (string< (cdr a) (cdr b)))))
+          (setq sexps (sort sexps (if sort-fn sort-fn
+                                    (lambda (a b)
+                                      (string< (cdr a) (cdr b))))))
           (cl-loop for (real . sort) in sexps
                    for (start . end) in markers
                    do (progn