2 files changed, 59 insertions, 32 deletions

@@ -49,12 +49,6 @@
   :documentation "Bind KEY to COMMAND in `acdw/leader' (C-z) map."
   :repeatable t)
 
-(setup-define :mode
-  (lambda (ext)
-    `(add-to-list 'auto-mode-alist (cons ,ext setup-mode)))
-  :documentation "Add SETUP-MODE to `auto-mode-alist' for EXTENSION."
-  :repeatable t)
-
 ;;; `no-littering'
 (setup (:straight no-littering)
   (:option no-littering-etc-directory (acdw/dir)
@@ -179,7 +173,7 @@
            completion-category-defaults nil
            completion-category-overrides
            '((file (styles . (partial-completion)))))
-  (icomplete-mode +1)
+  ;; (icomplete-mode +1)
 
   ;; Emoji
   (let ((ffl (font-family-list)))
@@ -257,7 +251,8 @@
            "C-c i" acdw/find-emacs-dotfiles
            "C-x k" acdw/kill-a-buffer)
 
-  (:leader "C-c" save-buffers-kill-emacs)
+  (:leader "C-c" save-buffers-kill-emacs
+           "t" acdw/insert-iso-date)
 
   ;;; Advice
   ;; `acdw/kill-line-and-join-advice' cribs from `crux-kill-and-join-forward'.
@@ -478,6 +473,7 @@
   (:option elpher-ipv4-always t
            elpher-certificate-directory (acdw/dir "elpher/")
            elpher-gemini-max-fill-width fill-column)
+  (:leader "e" elpher-bookmarks)
   (:bind "n" elpher-next-link
          "p" elpher-prev-link
          "o" elpher-follow-current-link
@@ -497,7 +493,16 @@
 (setup (:straight (gemini-mode
                    :host nil
                    :repo "https://git.carcosa.net/jmcbray/gemini.el.git"))
-  (:mode "\\.\\(gemini\\|gmi\\)\\'"))
+  (:file-match "\\.\\(gemini\\|gmi\\)\\'"))
+
+(setup (:straight (gemini-write
+                   :host nil
+                   :repo "https://alexschroeder.ch/cgit/gemini-write"
+                   :fork
+                   (:repo "https://tildegit.org/acdw/gemini-write"
+                          :branch "main")))
+  (with-eval-after-load 'elpher
+    (require 'gemini-write)))
 
 (setup dired
   (setq-default dired-recursive-copies 'always
@@ -551,7 +556,7 @@
 
 (setup (:straight nov)
   (:option nov-text-width fill-column)
-  (:mode "\\.epub\\'"))
+  (:file-match "\\.epub\\'"))
 
 (setup gnus
   (:option gnus-home-directory (expand-file-name "gnus" user-emacs-directory)
@@ -845,6 +850,8 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight paredit)
 
+  ;; I don't use paredit-splice-sexp much, and it stomps on isearch.
+  (:unbind "M-s")
   (defun setup-paredit-mode ()
     "Correct weirdnesses and set up paredit mode."
     (paredit-mode +1)
@@ -914,10 +921,10 @@ if ripgrep is installed, otherwise `consult-grep'."
 (when (executable-find "fennel")
   (setup (:straight fennel-mode)
     (autoload 'fennel-repl "fennel-mode" nil t)
-    (:mode "\\.fnl\\'")))
+    (:file-match "\\.fnl\\'")))
 
 (setup (:straight lua-mode)
-  (:mode "\\.lua\\'"))
+  (:file-match "\\.lua\\'"))
 
 (setup sh-mode
   (:option sh-basic-offset tab-width
@@ -940,13 +947,13 @@ if ripgrep is installed, otherwise `consult-grep'."
   (:option css-level-offset 2
            js-indent-level 2
            sgml-indent-offset 2)
-  (:mode "\\.\\(p\\|dj\\)?html\\'"
-         "\\.html?\\'"
-         "\\.\\(tpl\\.\\)?php\\'"
-         "\\.[agj]sp\\'"
-         "\\.as[cp]x\\'"
-         "\\.erb\\'"
-         "\\.mustache\\'"))
+  (:file-match "\\.\\(p\\|dj\\)?html\\'"
+               "\\.html?\\'"
+               "\\.\\(tpl\\.\\)?php\\'"
+               "\\.[agj]sp\\'"
+               "\\.as[cp]x\\'"
+               "\\.erb\\'"
+               "\\.mustache\\'"))
 
 (when (locate-library "gforth")
   (autoload 'forth-mode "gforth")
@@ -956,3 +963,10 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (when (eq acdw/system :home)
   (setup (:straight pkgbuild-mode)))
+
+
+;;; Server
+
+(require 'server)
+(unless (server-running-p)
+  (server-start))
@@ -57,19 +57,26 @@ each hook in HOOKS."
 (defun refresh-emacs ()
   "Reload Emacs's configuration files."
   (interactive)
-  (dolist (file (append
-                 ;; Load lisp libraries first, in case their functionality is
-                 ;; used by {early-,}init.el
-                 (let* ((dir (expand-file-name "lisp/" user-emacs-directory))
-                        (full-name (lambda (f)
-                                     (concat (file-name-as-directory dir) f))))
-                   (mapcar full-name (directory-files dir nil "\\.el\\'")))
-                 ;; Load regular init files
-                 (list (locate-user-emacs-file "early-init.el")
-                       (locate-user-emacs-file "init.el" ".emacs"))))
-    (with-message (format "Loading %s" file)
-      (when (file-exists-p file)
-        (load-file file)))))
+  (let ((init-files (append
+                     ;; Load lisp libraries first, in case their functionality
+                     ;; is used by {early-,}init.el
+                     (let* ((dir (expand-file-name "lisp/"
+                                                   user-emacs-directory))
+                            (full-name (lambda (f)
+                                         (concat
+                                          (file-name-as-directory dir) f))))
+                       (mapcar full-name (directory-files dir nil "\\.el\\'")))
+                     ;; Load regular init files
+                     (list (locate-user-emacs-file "early-init.el")
+                           (locate-user-emacs-file "init.el" ".emacs"))))
+        (debug-on-error t))
+    (with-message "Saving init files"
+      (save-some-buffers :no-confirm (lambda () (member (buffer-file-name)
+                                                        init-files))))
+    (dolist (file init-files)
+      (with-message (format "Loading %s" file)
+        (when (file-exists-p file)
+          (load-file file))))))
 
 (defun expand-file-name-exists-p (&rest expand-file-name-args)
   "Call `expand-file-name' on EXPAND-FILE-NAME-ARGS, returning
@@ -162,6 +169,12 @@ Prompt only if there are unsaved changes."
     (16 (mapc 'kill-buffer (delq (current-buffer) (buffer-list)))
         (delete-other-windows))))
 
+(defun acdw/insert-iso-date (with-time)
+  "Insert the ISO-8601-formatted date, with optional time."
+  (interactive "P")
+  (let ((format (if with-time "%FT%T%z" "%F")))
+    (insert (format-time-string format (current-time)))))
+
 
 ;; Make `C-z' more useful
 (defvar acdw/leader