Clean up Circe config

diff --git a/config.org b/config.org
index 53feda320fcebe275f11d6741190345bc424fb29..209fd454cdc0879b238f8a68e4af6c21b3a6d658 100644 (file)
--- a/config.org
+++ b/config.org
@@ -446,11 +446,6 @@ Some EWW enhancements.
 #+end_src
 ** IRC
 #+begin_src emacs-lisp
-  (use-package circe
-    :config
-    (enable-lui-track)
-    (enable-circe-color-nicks))
-
   (defun fetch-password (&rest params)
     (require 'auth-source)
     (let ((match (car (apply 'auth-source-search params))))
@@ -461,18 +456,22 @@ Some EWW enhancements.
               secret))
         (error "Password not found for %S" params))))
 
-  (setq circe-network-options
-        '(("pounce"
-           :host "irc.armaanb.net"
-           :nick "emacs"
-           :use-tls t
-           :port "6697"
-           :pass (lambda (fetch-password
-                          :login "emacs"
-                          :machine "irc.armaanb.net"
-                          :port 6697))))
-
-        (circe "pounce")
+  (use-package circe
+    :config
+    (enable-lui-track)
+    (enable-circe-color-nicks)
+    (circe "pounce")
+    :custom
+    (circe-network-options . '(("pounce"
+                                :host "irc.armaanb.net"
+                                :nick "emacs"
+                                :use-tls t
+                                :port "6697"
+                                :pass (lambda (fetch-password
+                                               :login "emacs"
+                                               :machine "irc.armaanb.net"
+                                               :port 6697)))))
+    (circe-default-part-message "goodbye!"))
 #+end_src
 * Emacs IDE
 ** Code cleanup