1 files changed, 112 insertions, 100 deletions

@@ -45,7 +45,6 @@
            "C-x 4 n" #'clone-buffer
            "C-c v" #'visible-mode
            "C-M-;" #'+lisp-comment-or-uncomment-sexp
-           "M-j" nil
            "C-x C-o" #'+switch-to-last-buffer
            "C-x o" #'+switch-to-last-buffer
            "C-x C-l" #'+open-paragraph  ; original: downcase-region
@@ -53,7 +52,13 @@
            "C-x C-m" #'execute-extended-command  ; original: coding systems
            "C-<backspace>" #'+backward-kill-word
            "C-x TAB" #'+indent-rigidly
+           "<f7>" #'flyspell-mode
            "C-x C-c" #'+save-buffers-quit)
+  ;; Disable bindings
+  (:global "M-j" nil
+           "<Scroll_Lock>" nil)
+  (:+leader "C-t d" #'toggle-debug-on-error
+            "C-t q" #'toggle-debug-on-quit)
   ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
   (global-set-key (kbd "C-h") 'delete-backward-char)
   (keyboard-translate ?\C-h ?\C-?)
@@ -81,6 +86,8 @@
   (+with-ensure-after-init
     (:hook #'+init-add-setup-to-imenu)))
 
+(setup (:require +window))
+
 (setup (:require auth-source)
   (:option auth-sources (list 'default
                               "secrets:passwords"
@@ -106,6 +113,9 @@
   (dolist (var '(safe-local-variable-values
                  warning-suppress-types))
     (add-to-list '+custom-variable-allowlist var))
+  ;; Load customizations now, and after init (to capture other possible
+  ;; variables I want to load) XXX: this is dumb
+  (+custom-load-ignoring-most-customizations)
   (+with-ensure-after-init
     (+custom-load-ignoring-most-customizations))
   (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
@@ -165,15 +175,19 @@
            auto-revert-verbose nil)
   (global-auto-revert-mode +1))
 
+(setup awk-mode
+  (:apheleia gawk '("gawk" "-f-" "-o-")))
+
 (setup bookmark
   (:option bookmark-save-flag 1
-           bookmark-watch-bookmark-file 'silent))
+           bookmark-watch-bookmark-file 'silent
+           bookmark-set-fringe-mark nil))
 
 (setup browse-url
   (:require +browse-url)
   (:option
-   browse-url-browser-function #'eww-browse-url
-   +browse-url-browser-function browse-url-browser-function
+   browse-url-browser-function 'browse-url-default-browser
+   +browse-url-browser-function #'eww-browse-url
    browse-url-generic-program (seq-some #'executable-find
                                         '("firefox"
                                           "chromium"
@@ -214,6 +228,7 @@
   ;; Set up URL handlers.
   (:option browse-url-handlers
            (list
+            (cons (rx bos (or "gemini:" "gopher:")) #'elpher-browse-url-elpher)
             (cons (rx                           ; images
                    "." (or "jpeg" "jpg" "png" "bmp") eos)
                   (lambda (&rest args)
@@ -328,7 +343,8 @@
 (setup eshell
   (:also-load em-smart
               em-tramp)
-  (:require +eshell)
+  (:require +eshell
+            esh-module)
   (+define-dir eshell/ (locate-user-emacs-file "eshell")
     "Where to place Eshell-specific files.")
   (:option eshell-aliases-file (eshell/ "aliases")
@@ -353,9 +369,11 @@
                                     (* " ")))
   (:+leader "s" #'+eshell-here
             "C-s" #'+eshell-here)
+  (add-to-list 'eshell-modules-list 'eshell-tramp)
   (with-eval-after-load 'mwim
     (setf (alist-get 'eshell-mode mwim-beginning-of-line-function)
           #'eshell-bol))
+  (:hook #'eshell-smart-initialize)
   (+eshell-eval-after-load
     ;; Local modes
     (dolist (mode '((hungry-delete-mode . -1)))
@@ -381,7 +399,10 @@
 (setup eww
   (:also-load +eww)
   (:option eww-search-prefix "https://duckduckgo.com/html?q="
-           url-privacy-level '(email agent cookies lastloc))
+           url-privacy-level '(email agent cookies lastloc)
+           eww-use-browse-url (rx bos (or "mailto:"
+                                          "gemini:"
+                                          "gopher:")))
   (add-hook 'eww-after-render-hook #'reading-mode)
   (:hook #'+eww-bookmark-setup
          #'+eww-track-readable-mode)
@@ -390,9 +411,6 @@
          "M-n" nil
          "M-p" nil))
 
-(setup flyspell
-  (:hook-into org-mode))
-
 (setup hideshow
   (:also-load +hideshow)
   (:with-mode hs-minor-mode
@@ -422,9 +440,12 @@
               ("help" (or (mode . help-mode)
                           (mode . Info-mode)
                           (mode . helpful-mode)))
-              ("irc" (or (mode . erc-mode)
-                         (mode . circe-server-mode)
-                         (mode . circe-channel-mode)))
+              ("chat" (or (mode . erc-mode)
+                          (mode . circe-server-mode)
+                          (mode . circe-channel-mode)
+                          (mode . jabber-chat-mode)
+                          (mode . jabber-browse-mode)
+                          (mode . jabber-roster-mode)))
               ("shell" (or (mode . eshell-mode)
                            (mode . shell-mode)
                            (mode . vterm-mode)))
@@ -531,17 +552,25 @@
     (add-hook 'message-send-hook #'+send-mail-dispatch)
     (advice-add 'notmuch-tag :filter-args #'+notmuch-correct-tags)
     (:option notmuch-saved-searches (list
-                                     (list :name "inbox"
+                                     (list :name "inbox+unread"
                                            :query (+notmuch-query-concat
                                                    "tag:inbox"
                                                    "tag:unread"
                                                    "NOT tag:Spam")
                                            :key "i")
-                                     (list :name "lists"
+                                     (list :name "inbox"
+                                           :query (+notmuch-query-concat
+                                                   "tag:inbox"
+                                                   "NOT tag:Spam")
+                                           :key "I")
+                                     (list :name "lists+unread"
                                            :query (+notmuch-query-concat
                                                    "tag:/List/"
                                                    "tag:unread")
                                            :key "l")
+                                     (list :name "lists"
+                                           :query "tag:/List/"
+                                           :key "L")
                                      (list :name "unread"
                                            :query (+notmuch-query-concat
                                                    "tag:unread"
@@ -630,7 +659,7 @@
            org-src-window-setup 'current-window
            org-startup-truncated nil
            org-startup-with-inline-images t
-           org-tags-column (- (- fill-column (length org-ellipsis)))
+           org-tags-column -77 ;; (- (- fill-column 1 (length org-ellipsis)))
            org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)" "ONGOING(o@)"
                                          "|" "DONE(d!)")
                                (sequence "|" "CANCELED(k@)")
@@ -656,6 +685,7 @@
   ;;           ))))
   (:bind "RET" #'+org-return-dwim
          "<S-return>" #'+org-table-copy-down
+         "M-RET" #'+org-meta-return
          "C-c C-l" #'+org-insert-link-dwim
          "C-c C-n" #'+org-next-heading-widen
          "C-c C-p" #'+org-previous-heading-widen
@@ -675,11 +705,11 @@
            "C-c l" #'org-store-link)
   (+with-ensure-after-init
     (:hook #'variable-pitch-mode
-         #'visual-fill-column-mode
-         #'turn-off-auto-fill
-         #'org-indent-mode
-         #'prettify-symbols-mode
-         #'+org-wrap-on-hyphens))
+           #'visual-fill-column-mode
+           #'turn-off-auto-fill
+           #'org-indent-mode ;; Needed for proper hanging indents in lists
+           #'prettify-symbols-mode
+           #'+org-wrap-on-hyphens))
   (:local-set prettify-symbols-alist '(("DEADLINE:" . ?→)
                                        ("SCHEDULED:" . ?↷)
                                        ("CLOSED:" . ?✓))
@@ -716,11 +746,13 @@
      ;; complains about "Invalid face reference: t" in org-mode buffers, because
      ;; `compose-region' returns t.
      ("^[ \t]*\\([-]\\) "
-      (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)
-       'fixed-pitch t))
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)
+         ;; 'fixed-pitch t
+         ))
      ("^[ \t]*\\([+]\\) "
-      (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "¬") 'fixed-pitch)
-       'fixed-pitch t))
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "•") 'fixed-pitch)
+         ;; 'fixed-pitch t
+         ))
      ("^[ \t]+\\([*]\\) "
       (0 ;; (progn (compose-region (match-beginning 1) (match-end 1) "→") 'fixed-pitch)
        'fixed-pitch t))
@@ -841,10 +873,7 @@
            org-export-with-sub-superscripts t
            org-export-with-toc nil)
   (with-eval-after-load 'ox
-    (+org-export-pre-hooks-insinuate))
-  (add-hook '+org-export-pre-hook #'+flyspell-correct-buffer)
-  (with-eval-after-load 'user-save
-    (add-hook '+org-export-pre-hook #'user-save-run-hooks)))
+    (+org-export-pre-hooks-insinuate)))
 
 (setup password-cache
   (:option password-cache t
@@ -869,6 +898,9 @@
     (+scratch-text-scratch))
   (add-hook 'kill-buffer-query-functions #'+scratch-immortal))
 
+(setup sh
+  (:apheleia shfmt '("shfmt")))
+
 (setup shell
   (:option shell-command-prompt-show-cwd t)
   (:local-set +modeline-position-function
@@ -920,6 +952,9 @@
   (tab-bar-mode +1)
   (display-time-mode +1))
 
+(setup text-mode
+  (:bind "C-M-k" #'kill-paragraph))
+
 (setup timer-list
   (:bind "d" #'timer-list-cancel)
   (:hook #'hl-line-mode
@@ -995,6 +1030,10 @@
     [remap isearch-query-replace] #'anzu-isearch-query-replace
     [remap isearch-query-replace-regexp] #'anzu-isearch-query-replace-regexp))
 
+(setup (:straight apheleia)
+  (:require apheleia +apheleia)
+  (apheleia-global-mode +1))
+
 (setup (:straight avy)
   (:require avy +avy)
   (:option avy-background t
@@ -1208,7 +1247,7 @@
 
   (:with-mode circe-chat-mode
     (:local-set lui-input-function #'+lui-filter
-                +modeline-position-function 'empty)
+                +modeline-position-function #'ignore)
     (:hook #'enable-circe-color-nicks
            #'enable-circe-new-day-notifier
            #'+circe-chat@set-prompt
@@ -1223,6 +1262,7 @@
   (:with-mode lui-mode
     (:option lui-fill-column (+ fill-column +circe-left-margin)
              lui-fill-type nil
+             lui-max-buffer-size (+bytes 10 :kb)
              lui-time-stamp-position 'right-margin
              lui-time-stamp-format "| %H:%M"
              lui-track-behavior 'before-switch-to-buffer
@@ -1251,6 +1291,7 @@
            #'enable-lui-track
            #'visual-fill-column-mode
            #'enable-lui-autopaste
+           (defun turn-off-+nyan-mode () (+nyan-local-mode -1))
            (defun turn-off-electric-pair-mode () (electric-pair-mode -1)))
     (:local-set fringes-outside-margins t
                 right-margin-width (length lui-time-stamp-format)
@@ -1303,8 +1344,10 @@
            xref-show-xrefs-function #'consult-xref
            xref-show-definitions-function #'consult-xref
            tab-always-indent 'complete
-           ;; completion-in-region-function #'consult-completion-in-region
+           completion-in-region-function #'consult-completion-in-region
            )
+  (:with-mode minibuffer-mode
+    (:local-set completion-in-region-function #'consult-completion-in-region))
   (advice-add #'register-preview :override #'consult-register-window)
   (dolist (binding '(;; C-c bindings (mode-specific-map)
                      ("C-c h" . consult-history)
@@ -1382,19 +1425,6 @@
     (with-eval-after-load 'orderless
       (:option consult--regexp-compiler #'consult--orderless-regexp-compiler))))
 
-(setup (:straight corfu)
-  (global-corfu-mode +1))
-
-(setup (:straight crossword)
-  ;; This isn't the perfect Emacs crossword puzzle, but it's the only one I
-  ;; know.
-  (:hook #'turn-off-+key-mode)
-  (:option crossword-save-path (sync/ "emacs/crosswords/" t)
-           crossword-empty-position-char "=")
-  (:face 'crossword-grid-face '((t :inherit 'font-lock-string-face))
-         'crossword-current-face '((t :inherit 'highlight))
-         'crossword-other-dir-face '((t :inherit 'font-lock-keyword-face))))
-
 (setup (:straight crux)
   ;; yes it's silly I have an addon to this addon.
   (:require crux +crux)
@@ -1472,6 +1502,11 @@
   (+with-ensure-after-init
     (edit-server-start)))
 
+(setup (:straight editorconfig)
+  (:with-mode conf-mode
+    (:file-match (rx ".editorconfig" eos)))
+  (editorconfig-mode +1))
+
 (setup (:straight electric-cursor)
   (:option electric-cursor-alist '((overwrite-mode . hbar)
                                    (god-local-mode . box)
@@ -1489,7 +1524,7 @@
                                                       "~/Downloads/")
                                          if (file-exists-p dir)
                                          return dir)
-   elfeed-search-filter "@1-month-ago +unread"
+   elfeed-search-filter "@10-days-ago +unread"
    elfeed-search-trailing-width 24
    elfeed-search-title-min-width 24
    elfeed-search-title-max-width 78
@@ -1685,10 +1720,6 @@
   (:option frowny-eyes (rx (any ":=") (opt "'") (? "-")))
   (global-frowny-mode +1))
 
-(setup (:straight gcmh)
-  (:option gcmh-idle-delay 'auto)
-  (gcmh-mode +1))
-
 (setup (:straight (geiser
                    :type git
                    :flavor melpa
@@ -1701,8 +1732,8 @@
                   scheme-complete))
     (straight-use-package pkg))
   (:require +chicken)
-  (setf (alist-get "\\.scm\\'" auto-mode-alist nil nil #'string=)
-        'scheme-mode)
+  (:with-mode scheme-mode
+    (:file-match (rx ".scm" eos)))
   (setf (alist-get "\\.scm\\'" auto-insert-alist nil nil #'equal)
         '(insert "#!/bin/sh\n#| -*- scheme -*-\nexec csi -s $0 \"$@\"\n|#\n")))
 
@@ -1855,7 +1886,8 @@
                                                ((string-match-p "hmm@" (buffer-name))
                                                 "🤔 ")))
                 file-percentage-mode nil
-                wrap-prefix (make-string +jabber-ws-prefix ?\ )))
+                wrap-prefix (make-string +jabber-ws-prefix ?\ )
+                comment-start nil))
   (:+leader "C-j" jabber-global-keymap)
   (advice-add 'jabber-activity-add :after #'+jabber-tracking-add)
   (advice-add 'jabber-activity-add-muc :after #'+jabber-tracking-add-muc)
@@ -1921,7 +1953,7 @@
 (setup (:straight (magit :host github :repo "magit/magit"
                          :build (:not compile))
          (:straight (transient :host github :repo "magit/transient"
-                        :build (:not compile))))
+                               :build (:not compile))))
   (autoload 'transient--with-suspended-override "transient"))
 
 (setup (:straight marginalia)
@@ -1929,9 +1961,7 @@
 
 (setup (:straight markdown-mode)
   (:option markdown-hide-markup nil)
-  (add-to-list 'auto-mode-alist (cons (rx (or ".md" ".markdown" ".mdown")
-                                          eos)
-                                      'markdown-mode))
+  (:file-match (rx (or ".md" ".markdown" ".mdown") eos))
   (with-eval-after-load 'visual-fill-column
     (:hook #'visual-fill-column-mode))
   (with-eval-after-load 'apheleia
@@ -1940,7 +1970,8 @@
       (setf (alist-get 'markdown-mode apheleia-mode-alist) 'markdownfmt)
       (setf (alist-get 'gfm-mode apheleia-mode-alist) 'markdownfmt))))
 
-(setup (:straight mastodon)
+(setup (:straight (mastodon
+                   :fork (:host nil :repo "https://codeberg.org/acdw/mastodon.el")))
   (:option mastodon-instance-url "https://tiny.tilde.website"
            mastodon-active-user "acdw"
            mastodon-client--token-file (.etc "mastodon.plstore")
@@ -1957,15 +1988,6 @@
          #'hl-line-mode
          #'lin-mode))
 
-(setup (:straight md4rd
-         :quit)
-  ;; `md4rd' is ... a bit janky, tbh.  But I'm including this here so I have it.
-  ;; TODO: enable opening Reddit links in md4rd
-  (:also-load _md4rd)
-  (defalias 'reddit 'md4rd "Browse Reddit.")
-  (with-eval-after-load 'md4rd
-    (run-with-timer 0 (* 60 59) 'md4rd-refresh-login)))
-
 (setup (:straight minions)
   (minions-mode +1))
 
@@ -2096,12 +2118,17 @@
   (:hook #'visual-fill-column-mode)
   (:file-match (rx ".epub" eos)))
 
-(setup (:straight nyan-mode)
-  (:require)
-  ;; For some reason, in some modes the mode-line isn't updated after these
-  ;; commands.  I think it might have to do with `+modeline-position-function'.
-  (advice-add 'end-of-buffer :after #'force-mode-line-update)
-  (advice-add 'beginning-of-buffer :after #'force-mode-line-update))
+(setup (:straight (nyan-mode
+                   :fork (:repo "duckwork/nyan-mode")))
+  (:require nyan-mode +nyan-mode)
+  (with-eval-after-load 'modus-themes
+    (add-hook 'modus-themes-after-load-theme-hook
+              (defun +nyan-modus-update-colors ()
+                (modus-themes-with-colors
+                  (set-face-attribute '+nyan-mode-line nil
+                                      :background bg-special-warm))))
+    (+nyan-modus-update-colors))
+  (+nyan-mode +1))
 
 (setup (:straight ol-notmuch))
 
@@ -2149,19 +2176,6 @@
             (defun org-mime-setup@org-mode ()
               (local-set-key (kbd "C-c M-o") 'org-mime-org-buffer-htmlize))))
 
-(setup (:straight org-modern)
-  (:quit "I think I can do most of this myself.")
-  (:option org-modern-hide-stars nil
-           org-modern-star nil
-           org-modern-list nil
-           org-modern-progress ["..." "o.." "oo." "Oo." "Ooo" "OOo" "OOO"])
-  (:face 'org-modern-label '((t ( :height 1.0
-                                  :weight regular
-                                  :underline nil
-                                  :inherit fixed-pitch))))
-  (advice-add 'org-modern--update-label-face :override #'ignore)
-  (:hook-into org-mode))
-
 (setup (:straight (org-taskwise
                    :host github
                    :repo "duckwork/org-taskwise.el"))
@@ -2235,9 +2249,8 @@
              (executable-find "g++")))
   (:also-load +pdf-tools)
   (:with-mode pdf-view-mode
-    (:local-set +modeline-position-function #'+pdf-view-position))
-  (setf (alist-get "\\.pdf\\'" auto-mode-alist nil nil #'equal)
-        #'pdf-view-mode)
+    (:local-set +modeline-position-function #'+pdf-view-position)
+    (:file-match (rx ".pdf" eos)))
   (pdf-tools-install :no-query))
 
 (setup (:straight persistent-scratch)
@@ -2304,8 +2317,8 @@
               +modeline-buffer-name
               +modeline-major-mode
               (lambda () (+modeline-vc " : "))
-              +modeline-anzu
               +modeline-nyan-on-focused
+              +modeline-anzu
               )
              (                          ; right
               simple-modeline-segment-process
@@ -2369,7 +2382,9 @@
    #'describe-gnu-project
    #'suspend-frame)
   (sophomore-disable-with 'confirm
-    #'save-buffers-kill-terminal)
+      #'save-buffers-kill-terminal)
+  (sophomore-disable-with 'confirm-y
+      #'+save-buffers-quit)
   (sophomore-mode +1))
 
 (setup (:straight (spongebob-case
@@ -2445,9 +2460,10 @@
 
 (setup (:straight (twtxt
                    :fork (:repo "duckwork/twtxt-el")))
-  (:option twtxt-file "/sshx:hetzner:/var/www/acdw.casa/tw.txt"
-           twtxt-following '(("acdw" "https://acdw.casa/tw.txt")))
-  (+with-ensure-after-init (:require)))
+  (:require)
+  (:also-load _twtxt)
+  (:option twtxt-file _twtxt-file
+           twtxt-following _twtxt-following))
 
 (setup (:straight undo-fu)
   (:option undo-fu-allow-undo-in-region t)
@@ -2473,8 +2489,6 @@
          'undo-hl-insert '((t :underline t)))
   (:hook-into text-mode prog-mode))
 
-(setup (:straight unfill))
-
 (setup (:straight valign
          :quit "Doesn't work with narrowed tables.")
   (:option valign-fancy-bar t)
@@ -2535,12 +2549,10 @@
                    :repo "casouri/vundo")))
 
 (setup (:straight web-mode)
-  (setf (alist-get (rx "." (or "htm" "html" "phtml" "tpl.php"
-                               "asp" "gsp" "jsp" "ascx" "aspx"
-                               "erb" "mustache" "djhtml")
-                       eos)
-                   auto-mode-alist)
-        'web-mode)
+  (:file-match (rx "." (or "htm" "html" "phtml" "tpl.php"
+                           "asp" "gsp" "jsp" "ascx" "aspx"
+                           "erb" "mustache" "djhtml")
+                   eos))
   (with-eval-after-load 'apheleia
     (setf (alist-get 'web-mode apheleia-mode-alist)
           'prettier)))