circe: libera is in (and leave alone my buffer names)

1 files changed, 7 insertions, 19 deletions

diff --git a/init.org b/init.org
index a2023f9..189c838 100644
--- a/init.org
+++ b/init.org
@@ -2849,7 +2849,8 @@
         :bind (:map circe-channel-mode-map
                     (("C-c C-a" . lui-track-jump-to-indicator)))
         :init
-        (setq circe-default-realname "https://jao.io"
+        (setq circe-chat-buffer-name "{target}"
+              circe-default-realname "https://jao.io"
               circe-default-part-message ""
               circe-default-quit-message ""
               circe-ignore-list nil
@@ -2896,23 +2897,11 @@
 
         (defvar jao-bitlbee-channels ())
         (setq circe-network-options
-              (let ((up (jao--get-user/password "freenode"))
+              (let ((up (jao--get-user/password "libera"))
                     (bup (jao--get-user/password "bitlbee")))
-                `(("libera" :host "irc.libera.chat"
-                   :port (6667 . 6697)
-                   :tls t :nick ,(car up) :channels ,jao-irc-channels
-                   :tls t :sasl-username ,(car up) :sasl-password ,(cadr up)
-                   :nickserv-mask "^NickServ!NickServ@services\\.$"
-                   :nickserv-identify-challenge
-                   "\C-b/msg\\s-NickServ\\s-identify\\s-<password>\C-b"
-                   :nickserv-identify-command
-                   "PRIVMSG NickServ :IDENTIFY {nick} {password}"
-                   :nickserv-identify-confirmation
-                   "^You are now identified for .*\\.$"
-                   :nickserv-ghost-command
-                   "PRIVMSG NickServ :GHOST {nick} {password}"
-                   :nickserv-ghost-confirmation
-                   "has been ghosted\\.$\\|is not online\\.$")
+                `(("Libera Chat" :host "irc.libera.chat"
+                   :nick ,(car up) :channels ,jao-irc-channels
+                   :tls t :sasl-username ,(car up) :sasl-password ,(cadr up))
                   ("Bitlbee"
                    :host "127.0.0.1" :nick ,(car bup)
                    :channels ,jao-bitlbee-channels
@@ -3009,8 +2998,7 @@
         (when (or p (y-or-n-p "Connect to telegram? "))
           (telega))
         (when (or p (y-or-n-p "Connect to libera? "))
-          ;; (jao-erc p)
-          (circe "libera")))
+          (circe "Libera Chat")))
 
      (pretty-hydra-define jao-hydra-chats (global-map "s-q" :color blue :quit-key "q")
        ("Connect"