circe nits

1 files changed, 22 insertions, 13 deletions

diff --git a/init.el b/init.el
index da1924b..a27c943 100644
--- a/init.el
+++ b/init.el
@@ -2508,7 +2508,13 @@
         lui-track-behavior 'before-tracking-next-buffer)
   :config
 
-  (defsubst jao-circe-nick-no () (length (circe-channel-nicks)))
+  (defsubst jao-circe-nick-no ()
+    (if (derived-mode-p 'circe-query-mode)
+        2
+        (length (circe-channel-nicks))))
+
+  (defsubst jao-circe-netowrk ()
+    (or (plist-get lui-logging-format-arguments :network) ""))
 
   (define-minor-mode jao-circe-user-number-mode ""
     :lighter (:eval (format " [%s]" (jao-circe-nick-no))))
@@ -2516,10 +2522,13 @@
   (defun jao-circe-channel-hook ()
     (when jao-mode-line-in-minibuffer
       (setq header-line-format
-            '(" %b" (:eval (format " - %s nicks" (jao-circe-nick-no))))))
+            '(" %b" (:eval (format "@%s - %s nicks"
+                                   (jao-circe-netowrk)
+                                   (jao-circe-nick-no))))))
     (jao-circe-user-number-mode 1))
 
   (add-hook 'circe-channel-mode-hook #'jao-circe-channel-hook)
+  (add-hook 'circe-query-mode-hook #'jao-circe-channel-hook)
 
   (defun circe-command-RECOVER (&rest _ignore)
     "Recover nick"
@@ -2552,11 +2561,13 @@
                 (list "Bitlbee" :host "127.0.0.1" :nick u
                       :channels jao-bitlbee-channels :lagmon-disabled t
                       :nickserv-password u :user p))
-              (list "localslack" :host "127.0.0.1" :nick "jao"
+              (list "bigml" :host "127.0.0.1" :nick "jao"
                     :channels jao-slack-channels :port 9007
                     :lagmon-disabled t)
               (list "recoveryou" :host "127.0.0.1" :nick "jao"
-                    :port 9008 :lagmon-disabled t)))
+                    :port 9008 :lagmon-disabled t)
+              (list "grio" :host "127.0.0.1" :nick "jao"
+                    :port 9009 :lagmon-disabled t)))
 
   (jao-shorten-modes 'circe-channel-mode
                      'circe-server-mode
@@ -2742,15 +2753,13 @@
       (jao-with-auth "matrix.org" u p (ement-connect :user-id u :password p))))
   (when (and (fboundp 'mastodon) (or p (y-or-n-p "Connect to mastodon? ")))
     (mastodon))
-  (when (or p (y-or-n-p "Connect to libera? "))
-    (unless (get-buffer "irc.libera.chat:6697")
-      (circe "Libera Chat")))
-  (when (or p (y-or-n-p "Connect to localslack? "))
-    (unless (get-buffer "127.0.0.1:9007")
-      (circe "localslack")))
-  (when (or p (y-or-n-p "Connect to recoveryou? "))
-    (unless (get-buffer "127.0.0.1:9008")
-      (circe "recoveryou"))))
+  (dolist (c '(("Libera Chat" . "irc.libera.chat:6697")
+               ("bigml" . "127.0.0.1:9007")
+               ("recoveryou" . "127.0.0.1:9008")
+               ("grio" . "127.0.0.1:9009")))
+    (unless (get-buffer (cdr c))
+      (when (or p (y-or-n-p (format "Connect to %s? " (car c))))
+        (circe (car c))))))
 
 (defun jao-all-chats ()
   (interactive)