1 files changed, 75 insertions, 40 deletions

@@ -291,6 +291,8 @@ package.  This macro is not repeatable."
            eval-expression-print-level nil
            lisp-indent-function #'lisp-indent-function)
 
+  (add-hook 'emacs-lisp-mode-hook #'checkdoc-minor-mode)
+  
   (add-hook 'emacs-lisp-mode-hook
             (defun emacs-lisp@enforce-lexical-binding ()
               (setq-local lexical-binding t)))
@@ -769,11 +771,12 @@ like a dumbass."
 (setup scratch
   (:option inhibit-startup-screen t
            initial-buffer-choice t
-           initial-scratch-message (concat ";; Howdy, "
-                                           (nth 0 (split-string
-                                                   user-full-name))
-                                           "!  "
-                                           "Welcome to GNU Emacs.\n\n")
+           initial-scratch-message ""
+           ;; (concat ";; Howdy, "
+           ;;         (nth 0 (split-string
+           ;;                 user-full-name))
+           ;;         "!  "
+           ;;         "Welcome to GNU Emacs.\n\n")
            initial-major-mode 'emacs-lisp-mode)
   
   (add-hook 'kill-buffer-query-functions
@@ -1069,33 +1072,6 @@ like a dumbass."
               (autoload 'dired-async--modeline-mode "dired-async.el" nil t)
               (dired-async--modeline-mode -1))))
 
-(setup (:straight ace-link)
-  (ace-link-setup-default)
-
-  ;; I use C-o here, even though it's usually `open-line', because it still
-  ;; matches the 'o' logic given by abo-abo (it's got the Open mnemonic and
-  ;; it's close to 'l'), and because I've given `open-line' to M-l --- I don't
-  ;; need `downcase-word' much, and when I do, I can use `downcase-dwim', bound
-  ;; to C-c l.
-  (let ((key (kbd "C-o")))
-    (with-eval-after-load 'erc
-      (autoload 'org-element-lineage "org-element")
-      (define-key erc-mode-map key #'ace-link))
-    (with-eval-after-load 'org
-      (define-key org-mode-map key #'ace-link-org))
-    (with-eval-after-load 'gnus
-      (define-key gnus-summary-mode-map key #'ace-link-gnus)
-      (define-key gnus-article-mode-map key #'ace-link-gnus))
-    (with-eval-after-load 'ert
-      (define-key ert-results-mode-map "o" #'ace-link-help))
-    (with-eval-after-load 'mastodon
-      (define-key mastodon-mode-map "o" #'ace-link-addr))
-    (with-eval-after-load 'circe
-      (define-key circe-channel-mode-map (kbd "C-o") #'ace-link-addr))
-    ;; And still everything else
-    (setq ace-link-fallback-function #'ace-link-addr)
-    (global-set-key key #'ace-link)))
-
 (setup (:straight alert)
   (:option alert-default-style (acdw/system
                                 (:home 'libnotify)
@@ -1140,6 +1116,29 @@ like a dumbass."
         circe-reduce-lurker-spam t
         circe-server-auto-join-default-type :after-auth)
 
+  (defun irc ()
+    "Connect to IRC."
+    (interactive)
+    (dolist (network (mapcar #'car circe-network-options))
+      (circe-maybe-connect network)))
+
+  (defun circe-network-connected-p (network)
+    "Return non-nil if there's any Circe server-buffer whose
+`circe-server-netwok' is NETWORK."
+    (catch 'return
+      (dolist (buffer (circe-server-buffers))
+        (with-current-buffer buffer
+          (if (string= network circe-server-network)
+              (throw 'return t))))))
+
+  (defun circe-maybe-connect (network)
+    "Connect to NETWORK, but ask user for confirmation if it's
+already been connected to."
+    (interactive "sNetwork: ")
+    (if (or (not (circe-network-connected-p network))
+            (y-or-n-p (format "Already connected to %s, reconnect?" network)))
+        (circe network)))
+
   (add-hook 'circe-chat-mode-hook
             (defun circe-chat@setup ()
               (lui-set-prompt
@@ -1154,6 +1153,9 @@ like a dumbass."
               (enable-circe-display-images)
               (enable-circe-new-day-notifier)))
 
+  (add-hook 'modus-themes-after-load-theme-hook
+            #'circe-nick-color-reset)
+
   (let ((len (number-to-string (- acdw-irc/left-margin 1
                                   (+ (length acdw-irc/pre-nick)
                                      (length acdw-irc/post-nick)))))
@@ -1193,7 +1195,7 @@ like a dumbass."
                           scroll-margin 0
                           word-wrap t
                           wrap-prefix (repeat-string
-                                       (1+ acdw-irc/left-margin) " "))
+                                       acdw-irc/left-margin " "))
               ;; (enable-lui-track-bar)
               )))
 
@@ -1322,8 +1324,7 @@ like a dumbass."
 (setup (:straight crux)
 
   (:global "C-x o" acdw/other-window-or-switch-buffer
-           ;; This is about to get WILD!
-           "M-l" crux-smart-open-line
+           "C-o" crux-smart-open-line
            "M-o" crux-smart-open-line-above
            "C-M-\\" crux-cleanup-buffer-or-region
            "C-x 4 t" crux-transpose-windows)
@@ -1355,7 +1356,7 @@ like a dumbass."
 
     (advice-add 'edit-server-make-frame :before
                 (defun edit-server@set-a-variable (&rest _)
-                  (setq edit-server-frame-p t)))))
+                  (setq-local edit-server-frame-p t)))))
 
 (setup (:straight (electric-cursor
                    :host github
@@ -1580,6 +1581,34 @@ successive invocations."
 (setup (:straight-if ledger-mode
                      (executable-find "ledger")))
 
+(setup (:straight link-hint)
+  ;; Browse web URLs with a browser with a prefix argument.
+  (dolist (type '(gnus-w3m-image-url
+                  gnus-w3m-url
+                  markdown-link
+                  mu4e-attachment
+                  mu4e-url
+                  notmuch-hello
+                  nov-link
+                  org-link
+                  shr-url
+                  text-url
+                  w3m-link
+                  w3m-message-link))
+    (link-hint-define-type type
+      :open-secondary browse-url-secondary-browser-function))
+
+  (defun acdw/link-hint-open-link (arg)
+    "Open a link using `link-hint-open-link', but like `browse-url-at-point'.
+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))))
+
+  (:global "C-c C-o" acdw/link-hint-open-link
+           "C-c o" acdw/link-hint-open-link))
+
 (setup (:straight lua-mode)
   (add-to-list 'auto-mode-alist  '("\\.lua\\'" . lua-mode)))
 
@@ -1809,7 +1838,12 @@ successive invocations."
 (setup (:straight persistent-scratch)
   (:option persistent-scratch-backup-directory (acdw/dir "scratch" t)
            persistent-scratch-keep-n-newest-backups 12)
-  (persistent-scratch-setup-default))
+  (persistent-scratch-setup-default)
+  (mapc (lambda (buf)
+          (with-current-buffer buf
+            (when (funcall persistent-scratch-scratch-buffer-p-function)
+              (persistent-scratch-mode +1))))
+        (buffer-list)))
 
 (setup (:straight restart-emacs)
   (defun emacs-upgrade (&optional update-packages)
@@ -1824,16 +1858,17 @@ successive invocations."
   (setup (:straight minions))
   (require 'acdw-modeline)
   (:option
-   simple-modeline-segments '((acdw-modeline/modified
+   simple-modeline-segments '(;; left
+                              (acdw-modeline/modified
                                acdw-modeline/buffer-name
                                acdw-modeline/vc-branch
                                acdw-modeline/position)
+                              ;; right
                               (simple-modeline-segment-misc-info
-                               acdw-modeline/erc
+                               acdw-modeline/track
                                acdw-modeline/wc
                                acdw-modeline/text-scale
                                simple-modeline-segment-process
-                               acdw-modeline/track
                                acdw-modeline/god-mode-indicator
                                acdw-modeline/winum
                                acdw-modeline/minions