Drop `csetq' macro and use good old `setq' and `setq-default'.

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

diff --git a/.emacs.d/lisp/bandali-erc.el b/.emacs.d/lisp/bandali-erc.el
index 3527a65..1180e93 100644 (file)
--- a/.emacs.d/lisp/bandali-erc.el
+++ b/.emacs.d/lisp/bandali-erc.el
@@ -1,6 +1,6 @@
 ;;; bandali-erc.el --- bandali's ERC setup           -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2018-2021  Amin Bandali
+;; Copyright (C) 2018-2022  Amin Bandali
 
 ;; Author: Amin Bandali <bandali@gnu.org>
 ;; Keywords: IRC, chat, client, Internet
@@ -26,14 +26,14 @@
 
 (with-eval-after-load 'erc
   (make-directory (b/var "erc/dcc") t)
-  (csetq
+  (setq
    erc-auto-query 'bury
    erc-autojoin-domain-only nil
    erc-dcc-get-default-directory (b/var "erc/dcc")
    erc-email-userid "bandali"
    erc-format-nick-function 'erc-format-@nick
    erc-join-buffer 'bury
-   erc-lurker-hide-list '("JOIN" "PART" "QUIT")
+   ;; erc-lurker-hide-list '("JOIN" "PART" "QUIT")
    erc-nick "bandali"
    erc-prompt "erc>"
    erc-prompt-for-password nil
@@ -84,7 +84,7 @@
   ;;  :foreground "steel blue")
 
   ;; erc-fill
-  ;; (csetq
+  ;; (setq
   ;;  erc-fill-column 77
   ;;  erc-fill-function 'erc-fill-variable
   ;;  erc-fill-static-center 18)
@@ -92,10 +92,24 @@
   ;; (erc-fill-mode -1)
 
   ;; erc-log
-  (csetq
+  (defun b/erc-log-directory (buffer target _nick server _port)
+    (let ((directory (concat (b/var "erc/logs/")
+                             ;; (or (with-current-buffer buffer
+                             ;;       (symbol-name erc-network))
+                             ;;     server)
+                             server
+                             (if (erc-server-buffer-p buffer)
+                                 (concat "/" server)
+                               (and target (concat "/" target))))))
+      (unless (file-exists-p directory)
+        (make-directory directory 'make-parents))
+      directory))
+  (defun b/erc-log-file-name (&rest _)
+    (concat (format-time-string "%Y-%m-%d") ".log"))
+  (setq
    ;; erc-enable-logging 'erc-log-all-but-server-buffers
-   erc-generate-log-file-name-function 'erc-generate-log-file-name-with-date
-   erc-log-channels-directory (b/var "erc/logs")
+   erc-generate-log-file-name-function #'b/erc-log-file-name
+   erc-log-channels-directory #'b/erc-log-directory
    erc-log-file-coding-system 'utf-8
    erc-log-write-after-insert t
    erc-log-write-after-send t
@@ -103,7 +117,7 @@
    erc-save-queries-on-quit nil)
 
   ;; erc-match
-  (csetq
+  (setq
    erc-pal-highlight-type 'nick
    erc-pals
    '("bremner" "^gopar" "^iank" "quidam" "^rwp" "sudoman"
@@ -118,12 +132,12 @@
      :background "#ffffdf"))
 
   ;; erc-pcomplete
-  (csetq erc-pcomplete-nick-postfix ",")
+  (setq erc-pcomplete-nick-postfix ",")
 
   ;; erc-stamp
-  (csetq erc-timestamp-only-if-changed-flag nil
-         erc-timestamp-format "%T "
-         erc-insert-timestamp-function 'erc-insert-timestamp-left)
+  (setq erc-timestamp-only-if-changed-flag nil
+        erc-timestamp-format "%T "
+        erc-insert-timestamp-function 'erc-insert-timestamp-left)
   (with-eval-after-load 'erc-match
     (set-face-attribute
      'erc-timestamp-face nil
@@ -132,7 +146,7 @@
      :background 'unspecified))
 
   ;; erc-track
-  (csetq
+  (setq
    erc-track-enable-keybindings nil
    erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
                              "324" "329" "332" "333" "353" "477")
@@ -147,26 +161,23 @@
 
 ;; global key bindings
 (global-set-key
- (kbd "C-c a e f")
+ (kbd "C-c a e l")
  (lambda ()
    (interactive)
-   (erc-tls :server "chat.freenode.net" :port 6697
-            :client-key (b/var "erc/certs/bandali-freenode.key")
-            :client-crt (b/var "erc/certs/bandali-freenode.crt"))))
+   (erc-tls :server "irc.libera.chat" :port 6697
+            :client-certificate t)))
 (global-set-key
  (kbd "C-c a e o")
  (lambda ()
    (interactive)
    (erc-tls :server "irc.oftc.net" :port 6697
-            :client-key (b/var "erc/certs/bandali-oftc.key")
-            :client-crt (b/var "erc/certs/bandali-oftc.crt"))))
+            :client-certificate t)))
 (global-set-key
  (kbd "C-c a e t")
  (lambda ()
    (interactive)
    (erc-tls :server "na.tilde.chat" :port 6697
-            :client-key (b/var "erc/certs/bandali-tildechat.key")
-            :client-crt (b/var "erc/certs/bandali-tildechat.crt"))))
+            :client-certificate t)))
 
 (provide 'bandali-erc)
 ;;; bandali-erc.el ends here