Merge branch 'main' of github.com:duckwork/.emacs.d

1 files changed, 124 insertions, 102 deletions

@@ -386,16 +386,12 @@
   
   (:with-map case-map
     (require 'titlecase)
+    (require 'acdw)
     (: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)))))
+           "s" #'spongebob-case-dwim))
   
   (column-number-mode +1))
 
@@ -680,7 +676,7 @@ specific to most general, they are these:
   (:option mouse-1-click-follows-link t))
 
 (setup mouse-avoidance
-  (mouse-avoidance-mode 'exile))
+  (mouse-avoidance-mode 'banish))
 
 (setup page
   (:option page-delimiter
@@ -728,19 +724,20 @@ specific to most general, they are these:
            (turn-on-auto-fill))))
 
 (setup pulse
-  (:option pulse-flag t
+  (:option pulse-flag nil
            pulse-delay 0.5
            pulse-iterations 1)
-  
+
   (defun pulse-line (&rest _)
     "Pulse the current line."
     (pulse-momentary-highlight-one-line (point)))
   
-  (dolist (command '(scroll-up-command
-                     scroll-down-command
-                     recenter-top-bottom other-window
-                     switch-to-buffer))
-    (advice-add command :after #'pulse-line)))
+  (dolist (func '(scroll-up-command
+                  scroll-down-command
+                  recenter-top-bottom other-window
+                  switch-to-buffer
+                  redraw-frame))
+    (advice-add func :after #'pulse-line)))
 
 (setup re-builder
   (require 'acdw-re)
@@ -972,18 +969,18 @@ specific to most general, they are these:
                    :repo "willvaughn/emacs-0x0"))
   (:option 0x0-default-server 'ttm))
 
-(setup (:straight-if affe
-                     (and (or (executable-find "fd")
-                              (executable-find "find"))
-                          (executable-find "rg")))
+(setup (:straight-when 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-when ahk-mode
+         (acdw/system :work)))
 
 (setup (:straight alert)
   (:option alert-default-style (acdw/system
@@ -1211,6 +1208,15 @@ specific to most general, they are these:
                      (funcall #'vertico-exit))
              "TAB" #'vertico-exit))))
 
+(setup (:straight consult-dir)
+  (:with-feature project
+    (:autoload project--read-project-list))
+  (:global "C-x C-d" #'consult-dir)
+  (with-eval-after-load 'vertico
+    (:with-map vertico-map
+      (:bind "C-x C-d" #'consult-dir
+             "C-x C-j" #'consult-dir-jump-file))))
+
 (setup (:straight crux)
   (:global "C-o" #'crux-smart-open-line
            "M-o" #'crux-smart-open-line-above
@@ -1219,10 +1225,10 @@ specific to most general, they are these:
 
   (crux-reopen-as-root-mode +1))
 
-(setup (:straight-if (define-repeat-map
+(setup (:straight-when (define-repeat-map
                                      :host nil
                                      :repo "https://tildegit.org/acdw/define-repeat-map.el")
-                     (acdw/system :home))
+         (acdw/system :home))
 
   (require 'define-repeat-map           ; just for me
            (acdw/dir
@@ -1452,8 +1458,8 @@ specific to most general, they are these:
     (add-hook hook #'epithet-rename-buffer)))
 
 ;; TODO: look into emms or something related for this
-(setup (:straight-if eradio
-                     (executable-find "mpv"))
+(setup (:straight-when eradio
+         (executable-find "mpv"))
   (:option
    eradio-player '("mpv" "--no-video" "--no-terminal")
    eradio-channels `(("KLSU" .
@@ -1495,16 +1501,16 @@ specific to most general, they are these:
   (:hook-into emacs-lisp-mode
               lisp-interaction-mode))
 
-(setup (:straight-if exec-path-from-shell
-                     (acdw/system :home))
+(setup (:straight-when exec-path-from-shell
+         (acdw/system :home))
   (when (daemonp)
     (exec-path-from-shell-initialize)))
 
 (setup (:straight expand-region)
   (:global "C-=" #'er/expand-region))
 
-(setup (:straight-if fennel-mode
-                     (executable-find "fennel"))
+(setup (:straight-when fennel-mode
+         (executable-find "fennel"))
   (:autoload (fennel-repl :interactive t))
   (:file-match (rx ".fnl" eos)))
 
@@ -1521,8 +1527,8 @@ specific to most general, they are these:
                       (flyspell-correct-move 0 :forward :rapid))))
     (:unbind "C-;" "C-," "C-." "C-M-i")))
 
-(setup (:straight-if forge
-                     (acdw/system :home))
+(setup (:straight-when forge
+         (acdw/system :home))
   ;; make sure to read Info manual with Forge (and Ghub) for setup
   ;; instructions.
   (with-eval-after-load 'magit
@@ -1535,26 +1541,26 @@ specific to most general, they are these:
   (:option gcmh-idle-delay 'auto)
   (gcmh-mode +1))
 
-(setup (:straight-if geiser
-                     (progn
-                       (defvar acdw/schemes
-                         (let (schemes)
-                           (dolist (scheme '(("scheme" . geiser-chez) ; chez
-                                             ("petite" . geiser-chez) ; petite
-                                             ("csi" . geiser-chez)    ; chicken
-                                             ("gsi" . geiser-gambit)
-                                             ("gosh" . geiser-gauche)
-                                             ("guile" . geiser-guile)
-                                             ("kawa" . geiser-kawa)
-                                             ("mit-scheme" . geiser-mit)
-                                             ("racket" . geiser-racket)
-                                             ("stklos" . geiser-stklos)))
-                             (when-let (binary (executable-find (car scheme)))
-                               (push binary schemes)
-                               ;; and install the proper helper package
-                               (straight-use-package (cdr scheme))))
-                           (nreverse schemes)))
-                       acdw/schemes))
+(setup (:straight-when geiser
+         (progn
+           (defvar acdw/schemes
+             (let (schemes)
+               (dolist (scheme '(("scheme" . geiser-chez) ; chez
+                                 ("petite" . geiser-chez) ; petite
+                                 ("csi" . geiser-chez)    ; chicken
+                                 ("gsi" . geiser-gambit)
+                                 ("gosh" . geiser-gauche)
+                                 ("guile" . geiser-guile)
+                                 ("kawa" . geiser-kawa)
+                                 ("mit-scheme" . geiser-mit)
+                                 ("racket" . geiser-racket)
+                                 ("stklos" . geiser-stklos)))
+                 (when-let (binary (executable-find (car scheme)))
+                   (push binary schemes)
+                   ;; and install the proper helper package
+                   (straight-use-package (cdr scheme))))
+               (nreverse schemes)))
+           acdw/schemes))
   (:file-match (rx ".rkt" eos)
                (rx ".scm" eos)))
 
@@ -1641,8 +1647,8 @@ specific to most general, they are these:
 (setup (:straight lacarte)
   (:global "<f10>" #'lacarte-execute-menu-command))
 
-(setup (:straight-if ledger-mode
-                     (executable-find "ledger")))
+(setup (:straight-when ledger-mode
+         (executable-find "ledger")))
 
 (setup (:straight link-hint)
   ;; Browse web URLs with a browser with a prefix argument.
@@ -1750,7 +1756,7 @@ browser defined in `browse-url-secondary-browser-function'."
   (:option modus-themes-slanted-constructs t
            modus-themes-bold-constructs t
            modus-themes-fringes nil
-           modus-themes-mode-line '(borderless moody)
+           modus-themes-mode-line '(borderless)
            modus-themes-region '(bg-only)
            modus-themes-org-blocks 'gray-background
            modus-themes-headings '((t . (background)))
@@ -1908,7 +1914,7 @@ browser defined in `browse-url-secondary-browser-function'."
   (:option org-adapt-indentation nil
            org-agenda-files nil                 ; only until I set this up
            org-catch-invisible-edits 'show-and-error
-           org-clock-clocked-in-display 'frame-title
+           org-clock-clocked-in-display 'mode-line
            org-clock-frame-title-format (cons '(t org-mode-line-string)
                                               (cons " --- " frame-title-format))
            ;;org-clock-string-limit 7             ; gives time and not title
@@ -1957,32 +1963,40 @@ browser defined in `browse-url-secondary-browser-function'."
 
   (:unbind "C-j"                        ; org-return-and-maybe-indent
            "M-j")
+
+  (:local-set unfill-fill-function #'org-fill-paragraph)
   
   (with-eval-after-load 'org-export
     (:option (append org-export-filter-final-output-functions)
              #'org-export-remove-zero-width-spaces))
 
-  (:hook #'variable-pitch-mode
-
-         ;; This is super ugly because I need to add a function to
-         ;; `before-save-hook', but only in org-mode buffers.  So I make a hook
-         ;; to make a hook.  I'm sure there's a better way to do this.
-         (defun org-mode@fix-blank-lines-on-save ()
-           (add-hook 'before-save-hook
-                     (defun acdw-org/fix-blank-lines-in-buffer ()
-                       (acdw-org/fix-blank-lines t))
-                     0 :local))
-         
-         (defun org-mode@wc-stupid ()
-           (unless (and wc-mode
-                        (> 0 (+ (or wc-orig-words 0)
-                                (or wc-words-delta 0)))))
-           (setq-local
-            wc-count-words-function
-            (lambda (start end) "Count words stupidly with a limit."
-              (acdw-org/count-words-stupidly start
-                                             end
-                                             999)))))
+  (:hook ;; #'variable-pitch-mode
+
+   ;; (defun org-mode@before-save@fill-buffer ()
+   ;;   (add-hook 'before-save-hook
+   ;;             (defun before-save@fill-buffer ()
+   ;;               (fill-region (point-min) (point-max)))
+   ;;             nil :local))
+
+   ;; This is super ugly because I need to add a function to
+   ;; `before-save-hook', but only in org-mode buffers.  So I make a hook
+   ;; to make a hook.  I'm sure there's a better way to do this.
+   (defun org-mode@fix-blank-lines-on-save ()
+     (add-hook 'before-save-hook
+               (defun acdw-org/fix-blank-lines-in-buffer ()
+                 (acdw-org/fix-blank-lines t))
+               0 :local))
+   
+   (defun org-mode@wc-stupid ()
+     (unless (and wc-mode
+                  (> 0 (+ (or wc-orig-words 0)
+                          (or wc-words-delta 0)))))
+     (setq-local
+      wc-count-words-function
+      (lambda (start end) "Count words stupidly with a limit."
+        (acdw-org/count-words-stupidly start
+                                       end
+                                       999)))))
 
   (with-eval-after-load 'org
     (org-clock-persistence-insinuate))
@@ -2106,10 +2120,10 @@ the default is \"/\"."
               lisp-interaction-mode
               scheme-mode))
 
-(setup (:straight-if (pdf-tools
-                      :host github
-                      :repo "vedang/pdf-tools")
-                     (acdw/system :home))
+(setup (:straight-when (pdf-tools
+                        :host github
+                        :repo "vedang/pdf-tools")
+         (acdw/system :home))
   (:file-match (rx ".pdf" eos))
   (pdf-loader-install))
 
@@ -2196,16 +2210,16 @@ the default is \"/\"."
   
   (simple-modeline-mode +1))
 
-(setup (:straight-if sly
-                     (progn
-                       (defvar acdw/lisps
-                         (let (lisps)
-                           (dolist (lisp '("sbcl" ; TODO: add more lisps
-                                           "clisp"))
-                             (when-let (binary (executable-find lisp))
-                               (push binary lisps)))
-                           (nreverse lisps)))
-                       acdw/lisps))
+(setup (:straight-when sly
+         (progn
+           (defvar acdw/lisps
+             (let (lisps)
+               (dolist (lisp '("sbcl" ; TODO: add more lisps
+                               "clisp"))
+                 (when-let (binary (executable-find lisp))
+                   (push binary lisps)))
+               (nreverse lisps)))
+           acdw/lisps))
   (:also-load sly-autoloads)
   (:straight clhs)
   
@@ -2261,7 +2275,10 @@ the default is \"/\"."
     (smartparens-strict-mode 1))
   
   (:bind "C-M-q" #'sp-indent-defun
-         "M-r" #'sp-rewrap-sexp))
+         "M-r" #'sp-rewrap-sexp)
+  (:unbind "M-j"                        ; sp-join-sexp
+           ))
+
 (setup (:straight ssh-config-mode)
   (:file-match (rx "/.ssh/config" eos)
                (rx "/ssh" (? "d") "_config" eos))
@@ -2282,8 +2299,8 @@ the default is \"/\"."
   (auto-save-visited-mode -1)
   (super-save-mode +1))
 
-(setup (:straight-if systemd
-                     (executable-find "systemd")))
+(setup (:straight-when systemd
+         (executable-find "systemd")))
 
 (setup (:straight (topsy
                    :host github
@@ -2291,7 +2308,7 @@ the default is \"/\"."
   (:hook-into prog-mode)
   (:when-loaded
    (:option topsy-header-line-format
-            '(:eval
+            `(:eval
               (list
                (propertize " "
                            'display
@@ -2345,7 +2362,9 @@ If used with a numeric prefix argument N, N backticks will be inserted."
   
   (global-undo-fu-session-mode +1))
 
-(setup (:straight unfill))
+(setup (:straight (unfill :host github :repo "purcell/unfill"
+                          :fork (:host github :repo "duckwork/unfill")))
+  (:global "M-q" #'unfill-toggle))
 
 (setup (:straight (unfocused
                    :host github
@@ -2395,8 +2414,8 @@ If used with a numeric prefix argument N, N backticks will be inserted."
 (setup (:straight visual-regexp)
   (:global "M-%" #'vr/query-replace))
 
-(setup (:straight-if vterm
-                     (acdw/system :home))
+(setup (:straight-when vterm
+         (acdw/system :home))
   (:straight (eshell-vterm
               :host github
               :repo "iostapyshyn/eshell-vterm"))
@@ -2452,12 +2471,15 @@ If used with a numeric prefix argument N, N backticks will be inserted."
 
 (setup (:straight xr))
 
-(setup (:straight-if ytel
-                     (executable-find "mpv"))
-  ;; This might need to be changed depending on whether the instance goes down.
-  (:option ytel-invidious-api-url "https://invidious.snopyta.org")
-  (:bind "v" #'acdw/ytel-current-video-link
-         "w" #'acdw/ytel-copy-link))
+(setup (:straight-when ytdious
+         (executable-find "mpv"))
+  (:also-load acdw-ytel)                ; so named because I used ytel first
+  (:option ytdious-invidious-api-url "https://invidious.snopyta.org")
+  (:hook #'hl-line-mode)
+  (:global "C-c y" #'ytdious)
+  (:bind "v" #'acdw/ytdious-watch
+         "w" #'acdw/ytdious-copy-link
+         "q" #'acdw/ytdious-quit))
 
 (setup (:straight zzz-to-char)