From 39c1c07363abeeca1c13f257fdacf0eb0851ac1f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 12 Apr 2020 23:55:06 -0400
Subject: [PATCH 1/1] Assimilate 4 drones for ERC setup, and move ERC things to
 lisp/

Assimilate erc-hl-nicks             1.3.4
Assimilate erc-scrolltoplace        0.1.0-1-gfeb0fbf
Assimilate switch-buffer-functions v0.0.1-12-g95a846b
Assimilate znc                      2fd359e
---
 .gitmodules                 | 12 ++++++
 init.el                     | 79 ++-----------------------------------
 lib/erc-hl-nicks            |  1 +
 lib/erc-scrolltoplace       |  1 +
 lib/switch-buffer-functions |  1 +
 lib/znc                     |  1 +
 lisp/bandali-erc.el         | 74 ++++++++++++++++++++++++++++++++++
 7 files changed, 93 insertions(+), 76 deletions(-)
 create mode 160000 lib/erc-hl-nicks
 create mode 160000 lib/erc-scrolltoplace
 create mode 160000 lib/switch-buffer-functions
 create mode 160000 lib/znc
 create mode 100644 lisp/bandali-erc.el

diff --git a/.gitmodules b/.gitmodules
index d341bbc..7aad07e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,6 +21,12 @@
 [submodule "ebdb"]
 	path = lib/ebdb
 	url = https://github.com/girzel/ebdb.git
+[submodule "erc-hl-nicks"]
+	path = lib/erc-hl-nicks
+	url = https://github.com/leathekd/erc-hl-nicks.git
+[submodule "erc-scrolltoplace"]
+	path = lib/erc-scrolltoplace
+	url = https://gitlab.com/jgkamat/erc-scrolltoplace.git
 [submodule "ivy"]
 	path = lib/ivy
 	url = https://github.com/abo-abo/swiper.git
@@ -50,6 +56,9 @@
 [submodule "s"]
 	path = lib/s
 	url = https://github.com/magnars/s.el.git
+[submodule "switch-buffer-functions"]
+	path = lib/switch-buffer-functions
+	url = https://github.com/10sr/switch-buffer-functions-el.git
 [submodule "transient"]
 	path = lib/transient
 	url = https://github.com/magit/transient.git
@@ -59,3 +68,6 @@
 [submodule "with-editor"]
 	path = lib/with-editor
 	url = https://github.com/magit/with-editor.git
+[submodule "znc"]
+	path = lib/znc
+	url = https://git.bandali.eu.org/znc.el.git
diff --git a/init.el b/init.el
index 57861bb..24765c8 100644
--- a/init.el
+++ b/init.el
@@ -651,6 +651,9 @@ For disabling the behaviour for certain buffers and/or modes."
 (require 'bandali-message)
 (require 'bandali-ebdb)
 
+;; IRC (with ERC and ZNC)
+(require 'bandali-erc)
+
 
 ;;; Editing
 (comment
@@ -1367,82 +1370,6 @@ For disabling the behaviour for certain buffers and/or modes."
                            (getenv "XDG_DOWNLOAD_DIR"))))
 
 
-;;; IRC (with ERC and ZNC)
-
-(use-package erc
-  :bind (("C-c b b" . erc-switch-to-buffer)
-         :map erc-mode-map
-         ("M-a" . erc-track-switch-buffer))
-  :custom
-  (erc-join-buffer 'bury)
-  (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
-  (erc-nick "bandali")
-  (erc-prompt "erc>")
-  (erc-rename-buffers t)
-  (erc-server-reconnect-attempts 5)
-  (erc-server-reconnect-timeout 3)
-  :config
-  (defun erc-cmd-OPME ()
-    "Request chanserv to op me."
-    (erc-message "PRIVMSG"
-                 (format "chanserv op %s %s"
-                         (erc-default-target)
-                         (erc-current-nick)) nil))
-  (defun erc-cmd-DEOPME ()
-    "Deop myself from current channel."
-    (erc-cmd-DEOP (format "%s" (erc-current-nick))))
-  (add-to-list 'erc-modules 'keep-place)
-  (add-to-list 'erc-modules 'notifications)
-  (add-to-list 'erc-modules 'smiley)
-  (add-to-list 'erc-modules 'spelling)
-  (add-to-list 'erc-modules 'scrolltoplace)
-  (erc-update-modules))
-
-(use-package erc-fill
-  :after erc
-  :custom
-  (erc-fill-column 77)
-  (erc-fill-function 'erc-fill-static)
-  (erc-fill-static-center 18))
-
-(use-package erc-pcomplete
-  :after erc
-  :custom
-  (erc-pcomplete-nick-postfix ", "))
-
-(use-package erc-track
-  :after erc
-  :bind (("C-c a e t d" . erc-track-disable)
-         ("C-c a e t e" . erc-track-enable))
-  :custom
-  (erc-track-enable-keybindings nil)
-  (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
-                             "324" "329" "332" "333" "353" "477"))
-  (erc-track-position-in-mode-line t)
-  (erc-track-priority-faces-only 'all)
-  (erc-track-shorten-function nil))
-
-(use-package erc-hl-nicks
-  :after erc)
-
-(use-package erc-scrolltoplace
-  :after erc)
-
-(use-package znc
-  :bind (("C-c a e e" . znc-erc)
-         ("C-c a e a" . znc-all))
-  :config
-  (let ((pwd (let ((auth (auth-source-search :host "znca")))
-               (cond
-                ((null auth) (error "Couldn't find znca's authinfo"))
-                (t (funcall (plist-get (car auth) :secret)))))))
-    (setq znc-servers
-          `(("znc.shemshak.org" 1337 t
-             ((freenode "amin/freenode" ,pwd)))
-            ("znc.shemshak.org" 1337 t
-             ((oftc "amin/oftc" ,pwd)))))))
-
-
 ;;; Post initialization
 
 )
diff --git a/lib/erc-hl-nicks b/lib/erc-hl-nicks
new file mode 160000
index 0000000..a67fe36
--- /dev/null
+++ b/lib/erc-hl-nicks
@@ -0,0 +1 @@
+Subproject commit a67fe361c8f2aa20fc235447fbb898f424b51439
diff --git a/lib/erc-scrolltoplace b/lib/erc-scrolltoplace
new file mode 160000
index 0000000..feb0fbf
--- /dev/null
+++ b/lib/erc-scrolltoplace
@@ -0,0 +1 @@
+Subproject commit feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9
diff --git a/lib/switch-buffer-functions b/lib/switch-buffer-functions
new file mode 160000
index 0000000..95a846b
--- /dev/null
+++ b/lib/switch-buffer-functions
@@ -0,0 +1 @@
+Subproject commit 95a846baa93bac4c3b3c028b9d53507f1042b23a
diff --git a/lib/znc b/lib/znc
new file mode 160000
index 0000000..2fd359e
--- /dev/null
+++ b/lib/znc
@@ -0,0 +1 @@
+Subproject commit 2fd359e556e05006e6976ba9b0f8cb220ea19863
diff --git a/lisp/bandali-erc.el b/lisp/bandali-erc.el
new file mode 100644
index 0000000..2d6f496
--- /dev/null
+++ b/lisp/bandali-erc.el
@@ -0,0 +1,74 @@
+(use-package erc
+  :bind (("C-c b b" . erc-switch-to-buffer)
+         :map erc-mode-map
+         ("M-a" . erc-track-switch-buffer))
+  :custom
+  (erc-join-buffer 'bury)
+  (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
+  (erc-nick "bandali")
+  (erc-prompt "erc>")
+  (erc-rename-buffers t)
+  (erc-server-reconnect-attempts 5)
+  (erc-server-reconnect-timeout 3)
+  :config
+  (defun erc-cmd-OPME ()
+    "Request chanserv to op me."
+    (erc-message "PRIVMSG"
+                 (format "chanserv op %s %s"
+                         (erc-default-target)
+                         (erc-current-nick)) nil))
+  (defun erc-cmd-DEOPME ()
+    "Deop myself from current channel."
+    (erc-cmd-DEOP (format "%s" (erc-current-nick))))
+  (add-to-list 'erc-modules 'keep-place)
+  (add-to-list 'erc-modules 'notifications)
+  (add-to-list 'erc-modules 'smiley)
+  (add-to-list 'erc-modules 'spelling)
+  (add-to-list 'erc-modules 'scrolltoplace)
+  (erc-update-modules))
+
+(use-package erc-fill
+  :after erc
+  :custom
+  (erc-fill-column 77)
+  (erc-fill-function 'erc-fill-static)
+  (erc-fill-static-center 18))
+
+(use-package erc-pcomplete
+  :after erc
+  :custom
+  (erc-pcomplete-nick-postfix ", "))
+
+(use-package erc-track
+  :after erc
+  :bind (("C-c a e t d" . erc-track-disable)
+         ("C-c a e t e" . erc-track-enable))
+  :custom
+  (erc-track-enable-keybindings nil)
+  (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
+                             "324" "329" "332" "333" "353" "477"))
+  (erc-track-position-in-mode-line t)
+  (erc-track-priority-faces-only 'all)
+  (erc-track-shorten-function nil))
+
+(use-package erc-hl-nicks
+  :after erc)
+
+(use-package erc-scrolltoplace
+  :after erc)
+
+(use-package znc
+  :bind (("C-c a e e" . znc-erc)
+         ("C-c a e a" . znc-all))
+  :config
+  (let ((pwd (let ((auth (auth-source-search :host "znca")))
+               (cond
+                ((null auth) (error "Couldn't find znca's authinfo"))
+                (t (funcall (plist-get (car auth) :secret)))))))
+    (setq znc-servers
+          `(("znc.shemshak.org" 1337 t
+             ((freenode "amin/freenode" ,pwd)))
+            ("znc.shemshak.org" 1337 t
+             ((oftc "amin/oftc" ,pwd)))))))
+
+(provide 'bandali-erc)
-- 
2.20.1