1 files changed, 37 insertions, 88 deletions

@@ -85,41 +85,7 @@
 
   (when-let ((default-directory
                (expand-file-name-exists-p "pkg/" user-emacs-directory)))
-    (normal-top-level-add-subdirs-to-load-path))
-
-  (defun acdw/sort-setups ()
-    "Sort `setup' forms in the current buffer.
-Actually sorts all forms, but based on the logic of `setup'.
-In short, DO NOT USE THIS FUNCTION!!!"
-    (save-excursion
-      (sort-sexps
-       (point-min) (point-max)
-       ;; Key function
-       nil
-       ;; Sort function
-       (lambda (s1 s2)                  ; oh god, this is worse.
-         (let* ((s1 (cdr s1)) (s2 (cdr s2)) ; for the strings themselves
-                (require-regexp (rx bos (* nonl) ":require"))
-                (straight-regexp (rx bos (* nonl) ":straight"))
-                (s1-require (string-match require-regexp s1))
-                (s2-require (string-match require-regexp s2))
-                (s1-straight (string-match straight-regexp s1))
-                (s2-straight (string-match straight-regexp s2)))
-           (cond
-            ;; Straight forms require some weirdness
-            ((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)))
-               (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)))))))))
+    (normal-top-level-add-subdirs-to-load-path)))
 
 (setup autorevert
   (:option global-auto-revert-non-file-buffers t
@@ -756,10 +722,7 @@ specific to most general, they are these:
 
          (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))
+           (turn-on-auto-fill))))
 
 (setup repeat
   ;; new for Emacs 28!
@@ -1001,30 +964,26 @@ specific to most general, they are these:
 (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))))))
+
+  (:also-load acdw-apheleia)
+  (add-hook 'before-save-hook #'apheleia-dumb-auto-format)
+
+  ;; Aphelia can't find prettier on Windows (though I
+  ;; installed it, I think), and it keeps trying to start
+  ;; new processes until Emacs runs out of subprocess space.
+  ;; So I just enable it at home.
+  (unless (acdw/system :work)
+    (apheleia-global-mode +1)))
 
 (setup (:straight async)
   (dired-async-mode +1))
 
 (setup (:straight avy)
-  (:global "C-'" #'avy-goto-char-timer
+  (:global "M-j" #'avy-goto-char-timer
            "C-c C-j" #'avy-resume)
 
   (:with-feature isearch
-    (:bind "C-'" #'avy-isearch)))
+    (:bind "M-j" #'avy-isearch)))
 
 (setup (:straight circe)
   (require 'circe)
@@ -1085,7 +1044,8 @@ specific to most general, they are these:
            ((t (:inherit (modus-themes-slant))))))
   
   (:bind "C-c C-p" #'circe-command-PART
-         "C-l" #'lui-track-jump-to-indicator)
+         "C-l" #'lui-track-jump-to-indicator
+         "<C-return>" #'circe-chat@set-prompt)
 
   (:advise circe-command-PART :after #'circe-part@kill-buffer           
            circe-command-QUIT :after #'circe-quit@kill-buffer
@@ -1096,15 +1056,7 @@ specific to most general, they are these:
             #'enable-circe-color-nicks
             ;; #'enable-circe-display-images
             #'enable-circe-new-day-notifier
-            (defun circe-chat@set-prompt ()
-              (lui-set-prompt
-               (concat
-                (propertize
-                 (acdw-irc/margin-format (buffer-name) " " "> ")
-                 'face 'circe-prompt-face
-                 'read-only t
-                 'intangible t
-                 'cursor-intangible t))))))
+            #'circe-chat@set-prompt))
 
   (autoload 'circe-nick-color-reset "circe-color-nicks")
   (add-hook 'modus-themes-after-load-theme-hook
@@ -1125,7 +1077,8 @@ specific to most general, they are these:
                 word-wrap t
                 wrap-prefix (repeat-string acdw-irc/left-margin " ")
                 line-number-mode nil
-                column-number-mode nil)
+                column-number-mode nil
+                file-percentage-mode nil)
     
     (:hook #'enable-lui-track)))
 
@@ -1296,9 +1249,8 @@ specific to most general, they are these:
     "Display tooltips for the current word" t)
   (autoload 'global-dictionary-tooltip-mode "dictionary"
     "Enable/disable dictionary-tooltip-mode for all buffers" t)
-  
-  (:with-map lookup-map
-    (:bind "d" #'dictionary-search)))
+
+  (define-key lookup-map "d" #'dictionary-search))
 
 (setup (:straight (dogears
                    :host github
@@ -1311,9 +1263,7 @@ specific to most general, they are these:
                     elfeed-show-mode
                     elfeed-search-mode))
       (:option (append dogears-ignore-modes) mode)))
-  (:global "M-g d" dogears-go
-           "M-g M-b" dogears-back
-           "M-g M-f" dogears-forward)
+  (:global "M-g d" dogears-go)
   (:autoload dogears-mode)
   (dogears-mode +1))
 
@@ -1500,6 +1450,11 @@ specific to most general, they are these:
   (:hook-into emacs-lisp-mode
               lisp-interaction-mode))
 
+(setup executable
+  (:option executable-prefix-env t)
+  (add-hook 'after-save-hook
+            #'executable-make-buffer-file-executable-if-script-p))
+
 (setup (:straight-if exec-path-from-shell
                      (acdw/system :home))
   (when (daemonp)
@@ -1677,23 +1632,14 @@ When PREFIX is non-nil, open links with
           (link-hint--multiple (if prefix :open-secondary :open))))
 
   (:option link-hint-avy-style 'post)
-  (:global "C-;"
+  (:global "C-j"
            (defun acdw/link-hint-open-link (arg)
              "Open a link using `link-hint-open-link', prefix-aware.
 That is, a prefix argument (\\[universal-argument]) will open the
 browser defined in `browse-url-secondary-browser-function'."
              (interactive "P")
              (avy-with link-hint-open-link
-                       (link-hint--one (if arg :open-secondary :open)))))
-
-  ;; Setup for different modes.
-  ;; There has /got/ to be an easier way here!
-  (dolist (key '(";" "o"))
-    (:with-mode special-mode (:bind key #'link-hint-open-link))
-    (:with-mode help-mode (:bind key #'link-hint-open-link))
-    (:with-feature helpful (:bind key #'link-hint-open-link))
-    (:with-mode Info-mode (:bind key #'link-hint-open-link))
-    (:with-feature reading (:bind key #'link-hint-open-link))))
+                       (link-hint--one (if arg :open-secondary :open))))))
 
 (setup (:straight lua-mode)
   (:file-match (rx ".lua" eos)))
@@ -1901,7 +1847,8 @@ browser defined in `browse-url-secondary-browser-function'."
          "C-c C-p" #'acdw/org-previous-heading-widen
          "C-x n t" #'org-narrow-to-task)
 
-  (:unbind "C-'")
+  (:unbind "C-j"                        ; org-return-and-maybe-indent
+           "M-j")
   
   (with-eval-after-load 'org-export
     (:option (append org-export-filter-final-output-functions)
@@ -2025,13 +1972,15 @@ the default is \"/\"."
   (global-page-break-lines-mode +1))
 
 (setup (:straight paredit)
-  ;; I don't use paredit-splice-sexp much, and it stomps on isearch.
-  (:unbind "M-s")
-
   (:bind "DEL" #'paredit-backward-delete
          "C-M-;" #'comment-or-uncomment-sexp
          "C-<backspace>" #'paredit-backward-kill-word
-         "M-w" #'paredit-copy-as-kill)
+         "M-w" #'paredit-copy-as-kill
+         "RET" #'paredit-newline)
+
+  (:unbind "M-s"                        ; paredit-splice-sexp
+           "C-j"                        ; paredit-newline (rebound to RET)
+           )
 
   (:hook-into emacs-lisp-mode
               ielm-mode sly-repl-mode