Merge branch 'main' of https://tildegit.org/acdw/emacs

1 files changed, 51 insertions, 7 deletions

@@ -979,11 +979,16 @@ like a dumbass."
     (setq read-extended-command-predicate
           #'command-completion-default-include-p))
 
+  (defvar case-map (make-sparse-keymap)
+    "A keymap for setting case in various ways.")
+  (global-set-key (kbd "C-c c") case-map)
+  
   (:global "M-=" count-words
            "C-w" kill-region-or-backward-word
-           "C-c c" capitalize-dwim
-           "C-c u" upcase-dwim
-           "C-c l" downcase-dwim
+           "C-c c c" capitalize-dwim
+           "C-c c t" titlecase-dwim
+           "C-c c u" upcase-dwim
+           "C-c c l" downcase-dwim
            "C-c d" acdw/insert-iso-date
            "M-`" nil)
 
@@ -1002,6 +1007,7 @@ like a dumbass."
   (defalias 'backward-word-with-case 'backward-word
     "Alias for `backward-word for use in `case-repeat-map'.")
 
+  ;; XXX: this isn't repeating correctly ...
   (defvar case-repeat-map
     (let ((map (make-sparse-keymap)))
       (define-key map "c" #'capitalize-word)
@@ -1048,7 +1054,9 @@ like a dumbass."
                 (indent-region (point-min) (point-max))))))
 
 (setup (:straight-if affe
-                     (executable-find "rg"))
+                     (and (or (executable-find "fd")
+                              (executable-find "find"))
+                          (executable-find "rg")))
   ;; Keys are bound in `acdw/sensible-grep' and `acdw/sensible-find'
   (defun affe-orderless-regexp-compiler (input _type)
     (setq input (orderless-pattern-compiler input))
@@ -1058,7 +1066,11 @@ like a dumbass."
 
 (setup (:straight async)
   (autoload 'dired-async-mode "dired-async.el" nil t)
-  (dired-async-mode +1))
+  (dired-async-mode +1)
+  (add-hook 'dired-mode
+            (defun dired@disable-dired-async-mode-line ()
+              (autoload 'dired-async--modeline-mode "dired-async.el" nil t)
+              (dired-async--modeline-mode -1))))
 
 (setup (:straight alert)
   (:option alert-default-style (acdw/system
@@ -1083,9 +1095,24 @@ like a dumbass."
   
   (setq acdw-irc/post-my-nick "-> ")
   
-  (setq circe-default-part-message "See You, Space Cowpokes . . ."
+  (setq circe-default-nick "acdw"
+        circe-default-part-message "See You, Space Cowpokes . . ."
         circe-highlight-nick-type 'all
-        ;; circe-network-options in private.el
+        circe-network-options
+        (("Libera Chat"
+          :channels ("#emacs" "#systemcrafters" "##webpals")
+          :sasl-username "acdw"
+          :sasl-password ,(acdw/fetch-password :host "libera.chat"))
+         ("Tilde Chat"
+          :channels ("#meta" "#bread" "#dadjokes" "#team")
+          :host "irc.tilde.chat" :port 6697 :use-tls t
+          :sasl-username "acdw"
+          :sasl-password ,(acdw/fetch-password :host "tilde.chat"))
+         ("Casa"
+          :channels ("#basement")
+          :host "m455.casa" :port 6697 :use-tls t
+          :sasl-username "acdw"
+          :sasl-password ,(acdw/fetch-password :host "m455.casa")))
         circe-reduce-lurker-spam t
         circe-server-auto-join-default-type :after-auth)
 
@@ -1336,6 +1363,23 @@ already been connected to."
                    :repo "duckwork/electric-cursor"))
   (electric-cursor-mode +1))
 
+(setup (:straight elfeed
+                  elfeed-protocol)
+  (:option elfeed-use-curl t
+           elfeed-feeds `(("fever+https://acdw@mf.acdw.net"
+                           :api-url "https://mf.acdw.net/fever/"
+                           :password ,(acdw/fetch-password
+                                       :host "mf.acdw.net"))))
+
+  (elfeed-protocol-enable)
+  
+  (add-hook 'elfeed-show-mode-hook
+            (defun elfeed-show@setup ()
+              (olivetti-mode +1)))
+
+  ;; see https://irreal.org/blog/?p=8885
+  )
+
 (setup (:straight (elpher :host nil
                           :repo "git://thelambdalab.xyz/elpher.git"))
   (:option elpher-ipv4-always t