Drop use-package

[~bandali/configs] / lisp / bandali-erc.el

diff --git a/lisp/bandali-erc.el b/lisp/bandali-erc.el
index 89ec6a0..0166140 100644 (file)
--- a/lisp/bandali-erc.el
+++ b/lisp/bandali-erc.el
@@ -24,20 +24,19 @@
 
 ;;; Code:
 
-(use-package erc
-  :bind ("C-c w e" . erc-switch-to-buffer-other-window)
-  :custom
-  (erc-auto-query 'bury)
-  (erc-autojoin-domain-only nil)
-  (erc-format-nick-function 'erc-format-@nick)
-  (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
+(with-eval-after-load 'erc
+  (csetq
+   erc-auto-query 'bury
+   erc-autojoin-domain-only nil
+   erc-format-nick-function 'erc-format-@nick
+   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)
+
   (declare-function erc-message "erc-backend"
                     (message-command line &optional force))
   (declare-function erc-default-target "erc")
@@ -57,72 +56,62 @@
   (add-to-list 'erc-modules 'smiley)
   (add-to-list 'erc-modules 'spelling)
   (declare-function erc-update-modules "erc")
-  (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-match
-  :disabled
-  :after erc
-  :config
-  (set-face-attribute
-   'erc-pal-face nil
-   :foreground 'unspecified
-   :weight 'unspecified
-   ;; :inherit 'font-lock-string-face
-   ;; :background (face-attribute 'font-lock-string-face :background)
-   :background "#ffffed")
-  :custom
-  (erc-pal-highlight-type 'message)
-  (erc-pals
-   '("aindilis" "blackbeard" "bremner" "brettgilio" "civodul" "dto"
-     "ggoes" "jrasata" "jxself" "mplsCorwin" "quiliro" "rindolf" "rwp"
-     "sachac" "technomancy")))
-
-(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)
-         ("C-c a e M-a" . erc-track-switch-buffer-other-window)
-         :map erc-mode-map
-         ("M-a" . erc-track-switch-buffer))
-  :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)
-  (erc-track-showcount t))
-
-(use-package erc-hl-nicks
-  :after erc)
-
-(use-package znc
-  :bind (("C-c a e e" . znc-erc)
-         ("C-c a e a" . znc-all))
-  :config
+  (erc-update-modules)
+
+  ;; erc-fill
+  (csetq
+   erc-fill-column 77
+   erc-fill-function 'erc-fill-static
+   erc-fill-static-center 18)
+
+  ;; erc-match
+  ;; (csetq
+  ;;  erc-pal-highlight-type 'message
+  ;;  erc-pals
+  ;;  '("aindilis" "blackbeard" "bremner" "brettgilio" "civodul" "dto"
+  ;;    "ggoes" "jrasata" "jxself" "mplsCorwin" "quiliro" "rindolf" "rwp"
+  ;;    "sachac" "technomancy"))
+  ;; (with-eval-after-load 'erc-match
+  ;;   (set-face-attribute
+  ;;    'erc-pal-face nil
+  ;;    :foreground 'unspecified
+  ;;    :weight 'unspecified
+  ;;    ;; :inherit 'font-lock-string-face
+  ;;    ;; :background (face-attribute 'font-lock-string-face :background)
+  ;;    :background "#ffffed"))
+
+  ;; erc-pcomplete
+  (csetq erc-pcomplete-nick-postfix ", ")
+
+  ;; erc-track
+  (csetq
+   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
+   erc-track-showcount t)
+
+  ;; key bindings
+  (global-set-key (kbd "C-c w e") #'erc-switch-to-buffer-other-window)
+  (define-key erc-mode-map (kbd "M-a") #'erc-track-switch-buffer))
+
+(with-eval-after-load 'znc
   (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.emacsconf.org" 6697 t
-             ((freenode "bandali/freenode" ,pwd)))
-            ("znc.emacsconf.org" 6697 t
-             ((oftc "bandali/oftc" ,pwd)))
-            ("znc.emacsconf.org" 6697 t
-             ((tildechat "bandali/tildechat" ,pwd)))))))
+    (csetq znc-servers
+           `(("znc.emacsconf.org" 6697 t
+              ((freenode "bandali/freenode" ,pwd)))
+             ("znc.emacsconf.org" 6697 t
+              ((oftc "bandali/oftc" ,pwd)))
+             ("znc.emacsconf.org" 6697 t
+              ((tildechat "bandali/tildechat" ,pwd)))))))
+;; global key bindings
+(global-set-key (kbd "C-c a e e") #'znc-erc)
+(global-set-key (kbd "C-c a e a") #'znc-all)
 
 (provide 'bandali-erc)
 ;;; bandali-erc.el ends here