summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-09-26 17:21:47 -0500
committerCase Duckworth2021-09-26 17:21:47 -0500
commit6bfdb8d254bc4884d500892608fe86808d9736b2 (patch)
treee1df81943c9510d4ebc0c4464394f5e60063804c
parentCorrect simple-modeline--format for right fringe (diff)
parentMerge branch 'main' of tildegit.org:acdw/emacs (diff)
downloademacs-6bfdb8d254bc4884d500892608fe86808d9736b2.tar.gz
emacs-6bfdb8d254bc4884d500892608fe86808d9736b2.zip
Merge branch 'main' of https://tildegit.org/acdw/emacs
-rw-r--r--init.el10
-rw-r--r--lisp/acdw-irc.el3
2 files changed, 8 insertions, 5 deletions
diff --git a/init.el b/init.el index 04ffd95..ef197c9 100644 --- a/init.el +++ b/init.el
@@ -1035,6 +1035,7 @@ specific to most general, they are these:
1035 circe-format-self-say (format 1035 circe-format-self-say (format
1036 "{nick:%1$d.%1$ds} > {body}" 1036 "{nick:%1$d.%1$ds} > {body}"
1037 (- acdw-irc/left-margin 3)) 1037 (- acdw-irc/left-margin 3))
1038 circe-network-inhibit-autoconnect '("Pissnet" "Twitch IRC")
1038 circe-network-options 1039 circe-network-options
1039 `(("Libera Chat" 1040 `(("Libera Chat"
1040 :channels ("#emacs" "#systemcrafters" "##webpals") 1041 :channels ("#emacs" "#systemcrafters" "##webpals")
@@ -1057,8 +1058,9 @@ specific to most general, they are these:
1057 :sasl-username ,circe-default-nick 1058 :sasl-username ,circe-default-nick
1058 :sasl-password ,(acdw/make-password-fetcher 1059 :sasl-password ,(acdw/make-password-fetcher
1059 :host "piss.hmm.st")) 1060 :host "piss.hmm.st"))
1060 ;; TODO: irc.chat.twitch.tv 1061 ("Twitch IRC" :host "irc.chat.twitch.tv" :port 6697 :use-tls t
1061 ) 1062 :nick "caseofducks" :user "caseofducks"
1063 :pass ,(acdw/make-password-fetcher)))
1062 circe-reduce-lurker-spam t 1064 circe-reduce-lurker-spam t
1063 circe-server-auto-join-default-type :after-auth 1065 circe-server-auto-join-default-type :after-auth
1064 circe-server-buffer-action (lambda (buf) 1066 circe-server-buffer-action (lambda (buf)
@@ -1249,8 +1251,8 @@ specific to most general, they are these:
1249 (crux-reopen-as-root-mode +1)) 1251 (crux-reopen-as-root-mode +1))
1250 1252
1251(setup (:straight-if (define-repeat-map 1253(setup (:straight-if (define-repeat-map
1252 :host nil 1254 :host nil
1253 :repo "https://tildegit.org/acdw/define-repeat-map.el") 1255 :repo "https://tildegit.org/acdw/define-repeat-map.el")
1254 (acdw/system :home)) 1256 (acdw/system :home))
1255 1257
1256 (defun acdw/other-window-or-switch-buffer-backward () 1258 (defun acdw/other-window-or-switch-buffer-backward ()
diff --git a/lisp/acdw-irc.el b/lisp/acdw-irc.el index 1fc7482..8ec5893 100644 --- a/lisp/acdw-irc.el +++ b/lisp/acdw-irc.el
@@ -71,7 +71,8 @@ and right on t."
71 "Connect to all IRC networks in `circe-network-options'." 71 "Connect to all IRC networks in `circe-network-options'."
72 (interactive) 72 (interactive)
73 (dolist (network (mapcar #'car circe-network-options)) 73 (dolist (network (mapcar #'car circe-network-options))
74 (circe-maybe-connect network))) 74 (unless (member network circe-network-inhibit-autoconnect)
75 (circe-maybe-connect network))))
75 76
76(el-patch-feature circe) 77(el-patch-feature circe)
77(with-eval-after-load 'circe 78(with-eval-after-load 'circe