From 83b0fd286af27d27eeac66b4fd841bec80f6d96a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 30 Jul 2024 07:36:43 +0100
Subject: [PATCH] Move IRC function definitions up to top level

---
 init.el | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/init.el b/init.el
index 6c130b0..865fbf6 100644
--- a/init.el
+++ b/init.el
@@ -1135,27 +1135,26 @@ Calls `project-remember-projects-under' for ~/Projects/"
   :commands erc-compute-nick
   :custom
   (erc-nick (user-login-name))
-  (erc-user-full-name (user-full-name))
-  :config
-  (when (require 'password-store nil :noerror)
-    (defun my/libera-chat-connect ()
-      "Connect to irc.libera.chat directly."
-      (interactive)
-      (require 'erc)
-      (require 'password-store)
-      (erc-tls
-       :server "irc.libera.chat"
-       :password (password-store-get 'irc.libera.chat)))
-    (defun my/znc-connect ()
-      "Connect to my ZNC IRC bouncer."
-      (interactive)
-      (require 'erc)
-      (require 'password-store)
-      (erc-tls
-       :server "xenia.me.uk"
-       :port 6697
-       :nick (concat (erc-compute-nick) "/liberachat")
-       :password (password-store-get 'znc)))))
+  (erc-user-full-name (user-full-name)))
+
+(defun my/libera-chat-connect ()
+  "Connect to irc.libera.chat directly."
+  (interactive)
+  (require 'erc)
+  (require 'password-store)
+  (erc-tls
+   :server "irc.libera.chat"
+   :password (password-store-get 'social/irc.libera.chat)))
+(defun my/znc-connect ()
+  "Connect to my ZNC IRC bouncer."
+  (interactive)
+  (require 'erc)
+  (require 'password-store)
+  (erc-tls
+   :server "xenia.me.uk"
+   :port 6697
+   :nick (concat (erc-compute-nick) "/liberachat")
+   :password (password-store-get 'local/znc)))
 
 (use-package eww
   :defer t