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

2 files changed, 8 insertions, 5 deletions

@@ -1035,6 +1035,7 @@ specific to most general, they are these:
            circe-format-self-say (format
                                   "{nick:%1$d.%1$ds} > {body}"
                                   (- acdw-irc/left-margin 3))
+           circe-network-inhibit-autoconnect '("Pissnet" "Twitch IRC")
            circe-network-options
            `(("Libera Chat"
               :channels ("#emacs" "#systemcrafters" "##webpals")
@@ -1057,8 +1058,9 @@ specific to most general, they are these:
               :sasl-username ,circe-default-nick
               :sasl-password ,(acdw/make-password-fetcher
                                :host "piss.hmm.st"))
-             ;; TODO: irc.chat.twitch.tv
-             )
+             ("Twitch IRC" :host "irc.chat.twitch.tv" :port 6697 :use-tls t
+              :nick "caseofducks" :user "caseofducks"
+              :pass ,(acdw/make-password-fetcher)))
            circe-reduce-lurker-spam t
            circe-server-auto-join-default-type :after-auth
            circe-server-buffer-action (lambda (buf)
@@ -1249,8 +1251,8 @@ specific to most general, they are these:
   (crux-reopen-as-root-mode +1))
 
 (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 ()
@@ -71,7 +71,8 @@ and right on t."
   "Connect to all IRC networks in `circe-network-options'."
   (interactive)
   (dolist (network (mapcar #'car circe-network-options))
-    (circe-maybe-connect network)))
+    (unless (member network circe-network-inhibit-autoconnect)
+      (circe-maybe-connect network))))
 
 (el-patch-feature circe)
 (with-eval-after-load 'circe