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

1 files changed, 22 insertions, 5 deletions

@@ -170,7 +170,8 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     (cons (rx (or "google.com"         ; websites that don't work with eww
                   "reddit.com"
                   "twitter.com"
-                  "imgur.com"))
+                  "imgur.com"
+                  "pixelfed"))
           browse-url-secondary-browser-function)
     (cons "."                          ; everything else
           #'eww-browse-url)))
@@ -233,6 +234,11 @@ AKA, DO NOT USE THIS FUNCTION!!!"
               :sasl-username ,circe-default-nick
               :sasl-password ,(acdw/make-password-fetcher
                                :host "m455.casa"))
+             ("Pissnet" :host "piss.hmm.st" :port 6697 :use-tls t
+              :channels ("#i-just-peed")
+              :sasl-username ,circe-default-nick
+              :sasl-password ,(acdw/make-password-fetcher
+                               :host "piss.hmm.st"))
              ;; TODO: irc.chat.twitch.tv
              )
            circe-reduce-lurker-spam t
@@ -265,6 +271,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (defun circe-command-SHORTEN (url)
     "Shorten URL using `0x0-shorten-uri'."
     (interactive "sURL to shorten: ")
+    ;; TODO: enable /shorten URL comment syntax
     (let ((short-url (0x0-shorten-uri (0x0--choose-server) url)))
       (circe-command-SAY short-url)))
 
@@ -380,6 +387,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
            consult-project-root-function #'vc-root-dir
            completion-in-region-function #'acdw-consult/complete-in-region
            completion-cycle-threshold 3
+           consult-preview-key (kbd "M-.")
            tab-always-indent 'complete)
 
   (:advise register-preview :override #'consult-register-window)
@@ -461,8 +469,8 @@ AKA, DO NOT USE THIS FUNCTION!!!"
   (:hook visual-line-mode))
 
 (setup (:straight-if (define-repeat-map
-                                     :host nil
-                                     :repo "https://tildegit.org/acdw/define-repeat-map.el")
+                                   :host nil
+                                   :repo "https://tildegit.org/acdw/define-repeat-map.el")
                      (acdw/system :home))
 
   (defun acdw/other-window-or-switch-buffer-backward ()
@@ -865,7 +873,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                      ("BadRadio: 24/7 PHONK" .
                       "https://s2.radio.co/s2b2b68744/listen")
                      ("tilderadio" .
-                      "https://radio.tildeverse.org/radio/8000/radio.ogg")
+                      "https://azuracast.tilderadio.org/radio/8000/radio.ogg")
                      ("vantaradio" .
                       "https://vantaa.black/radio")))
   (:global "C-c r r" #'eradio-play        ; mnemonic: radio
@@ -1024,12 +1032,15 @@ specific to most general, they are these:
   (:hook-into text-mode))
 
 (setup (:straight flyspell-correct)
+  (:option flyspell-correct-interface #'flyspell-correct-completing-read
+           flyspell-correct--cr-key "`")
   (:with-feature flyspell
     (:hook (defun flyspell@correct ()
              (:bind "C-;" #'flyspell-correct-wrapper)
              (:unbind "C-," "C-." "C-M-i")))))
 
-(setup (:straight forge)
+(setup (:straight-if forge
+                     (acdw/system :home))
   ;; make sure to read Info manual with Forge (and Ghub) for setup
   ;; instructions.
   (with-eval-after-load 'magit
@@ -1496,6 +1507,8 @@ browser defined in `browse-url-secondary-browser-function'."
          "C-c C-n" #'acdw/org-next-heading-widen
          "C-c C-p" #'acdw/org-previous-heading-widen)
 
+  (:unbind "C-'")
+  
   (with-eval-after-load 'org-export
     (:option (append org-export-filter-final-output-functions)
              #'org-export-remove-zero-width-spaces))
@@ -1607,6 +1620,10 @@ browser defined in `browse-url-secondary-browser-function'."
 (setup (:straight powerthesaurus)
   (:global "C-c l t" #'powerthesaurus-lookup-word-dwim))
 
+(setup (:straight prism)
+  (:hook-into lisp-mode
+              c-mode))
+
 (setup prog
   (:option show-paren-delay 0
            show-paren-style 'mixed