1 files changed, 36 insertions, 28 deletions

@@ -279,10 +279,12 @@
 
   (:leader "s" eshell-pop-or-quit)
   
-  (hook-defun eshell-setup 'eshell-mode-hook
-    (define-key eshell-mode-map (kbd "C-d") #'eshell-quit-or-delete-char)
-    (when (boundp 'simple-modeline--mode-line)
-      (setq mode-line-format '(:eval simple-modeline--mode-line)))))
+  (add-hook 'eshell-mode-hook
+            (defun eshell-mode@setup ()
+              (define-key eshell-mode-map (kbd "C-d")
+                #'eshell-quit-or-delete-char)
+              (when (boundp 'simple-modeline--mode-line)
+                (setq mode-line-format '(:eval simple-modeline--mode-line))))))
 
 (setup eww
   (:option eww-search-prefix "https://duckduckgo.com/html?q="
@@ -355,6 +357,8 @@
   (:option ibuffer-saved-filter-groups
            '(("default"
               ("dired" (mode . dired-mode))
+              ("elpher" (or (mode . elpher-mode)
+                            (mode . gemini-mode)))
               ("emacs" (or (name . "^\\*scratch\\*$")
                            (name . "^\\*Messages\\*$")))
               ("gnus" (or (mode . message-mode)
@@ -423,9 +427,10 @@
 (setup prog
   (:option smie-indent-basic tab-width)
   
-  (hook-defun auto-fill-prog-mode prog-mode-hook
-    (setq-local comment-auto-fill-only-comments t)
-    (turn-on-auto-fill))
+  (add-hook 'prog-mode-hook
+            (defun prog-mode@auto-fill ()
+              (setq-local comment-auto-fill-only-comments t)
+              (turn-on-auto-fill)))
 
   (:option show-paren-delay 0
            show-paren-style 'mixed
@@ -531,11 +536,12 @@
                                            "Welcome to GNU Emacs.\n\n")
            initial-major-mode 'emacs-lisp-mode)
   
-  (hook-defun immortal-scratch kill-buffer-query-functions
-    (if (eq (current-buffer) (get-buffer "*scratch*"))
-        (progn (bury-buffer)
-               nil)
-      t)))
+  (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
@@ -678,14 +684,16 @@
   (apheleia-global-mode +1)
 
   ;; Use a dumb formatter on modes that `apheleia' doesn't work for.
-  (hook-defun dumb-auto-format before-save-hook
-    (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)))))
+  (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)
   (autoload 'dired-async-mode "dired-async.el" nil t)
@@ -712,17 +720,17 @@
                    :repo "minad/consult"))
 
   ;; "Sensible" functions
-  (defun consult-sensible-grep ()
+  (defun consult-sensible-grep (&optional arg)
     "Perform `consult-git-grep' if in a git project, otherwise `consult-ripgrep'
 if ripgrep is installed, otherwise `consult-grep'."
     (interactive "P")
-    (cond ((= (vc-backend buffer-file-name) "Git")
+    (cond ((string-equal (vc-backend buffer-file-name) "Git")
            (call-interactively #'consult-git-grep))
           ((executable-find "rg")
            (call-interactively #'consult-ripgrep))
           (t (call-interactively #'consult-grep))))
   
-  (defun consult-sensible-find ()
+  (defun consult-sensible-find (&optional arg)
     "Peform `consult-locate' if locate is installed, otehrwise `consult-find'."
     (interactive "P")
     (cond ((executable-find "locate") (call-interactively #'consult-locate))
@@ -833,9 +841,7 @@ if ripgrep is installed, otherwise `consult-grep'."
    (setup (:straight (gemini-write
                       :host nil
                       :repo "https://alexschroeder.ch/cgit/gemini-write"
-                      :fork
-                      (:repo "https://tildegit.org/acdw/gemini-write"
-                             :branch "main")))
+                      :branch "main"))
      (require 'gemini-write))))
 
 (setup (:straight expand-region)
@@ -943,7 +949,7 @@ if ripgrep is installed, otherwise `consult-grep'."
   (:option org-adapt-indentation nil
            org-catch-invisible-edits 'smart
            org-confirm-babel-evaluate nil
-           org-ellipsis " ⌵"
+           org-ellipsis " …"
            org-export-coding-system 'utf-8-unix
            org-export-headline-levels 8
            org-export-with-section-numbers nil
@@ -986,7 +992,9 @@ if ripgrep is installed, otherwise `consult-grep'."
   (defun setup-paredit-mode ()
     "Correct weirdnesses and set up paredit mode."
     (paredit-mode +1)
-    (define-key lisp-mode-shared-map (kbd "DEL") #'paredit-backward-delete))
+    (let ((map lisp-mode-shared-map))
+      (define-key map (kbd "DEL") #'paredit-backward-delete)
+      (define-key map (kbd "C-M-;") #'comment-or-uncomment-sexp)))
   
   (dolist (mode lispy-modes)
     (add-hook (intern (concat (symbol-name mode) "-hook"))