Update/shorten various custom Emacs bindings

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

diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index a7fa68d..237e4f3 100644 (file)
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -1,6 +1,6 @@
 ;;; bandali-gnus.el --- bandali's Gnus setup         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2018-2021  Amin Bandali
+;; Copyright (C) 2018-2022  Amin Bandali
 
 ;; Author: Amin Bandali <bandali@gnu.org>
 ;; Keywords: mail, news
@@ -40,7 +40,7 @@
 
 (declare-function article-make-date-line "gnus-art" (date type))
 
-(csetq
+(setq
  mail-user-agent 'gnus-user-agent
  read-mail-command 'gnus
 
@@ -49,6 +49,13 @@
  `(,@(cond
       ((string= (system-name) "langa")
        '((nnimap
+          "kelar"
+          (nnimap-stream plain)
+          (nnimap-address "127.0.0.1")
+          (nnimap-server-port 143)
+          (nnimap-authenticator plain)
+          (nnimap-user "bandali@kelar.local"))
+         (nnimap
           "shemshak"
           (nnimap-stream plain)
           (nnimap-address "127.0.0.1")
@@ -74,12 +81,20 @@
             (from ".+-\\(owner\\|bounces\\)@\\(non\\)?gnu\\.org" "listmod")
             ;; gnu
             (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+            ;; fsf
+            (list ".*<\\(.*\\)\\.fsf\\.org>.*" "l.\\1")
             ;; gnus
             (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
             ;; libreplanet
             (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
             ;; iana (e.g. tz-announce)
             (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
+            ;; mailop
+            (list ".*<\\(.*\\)\\.mailop\\.org>.*" "l.\\1")
+            ;; sdlu
+            (list ".*<\\(.*\\)\\.spammers\\.dontlike\\.us>.*" "l.sdlu")
+            ;; bitfolk
+            (from ".*@\\(.+\\)?bitfolk\\.com>.*" "bitfolk")
             ;; haskell
             (list ".*<\\(.*\\)\\.haskell\\.org>.*" "l.\\1")
             ;; *.lists.sr.ht, omitting one dot if present
@@ -197,11 +212,11 @@
   (add-hook 'gnus-group-mode-hook #'gnus-topic-mode)
   (add-hook 'gnus-group-mode-hook #'gnus-agent-mode))
 ;; global key bindings
-(global-set-key (kbd "C-c m") #'gnus-plugged)
-(global-set-key (kbd "C-c M") #'gnus-unplugged)
+(global-set-key (kbd "C-c g") #'gnus-plugged)
+(global-set-key (kbd "C-c G") #'gnus-unplugged)
 
 (with-eval-after-load 'gnus-art
-  (csetq
+  (setq
    gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
    gnus-sorted-header-list '("^From:"
                              "^X-RT-Originator"
@@ -251,9 +266,9 @@
   (define-key gnus-article-mode-map (kbd "M-L") #'org-store-link))
 
 (with-eval-after-load 'gnus-sum
-  (csetq gnus-thread-sort-functions '(gnus-thread-sort-by-number
-                                      gnus-thread-sort-by-subject
-                                      gnus-thread-sort-by-date))
+  (setq gnus-thread-sort-functions '(gnus-thread-sort-by-number
+                                     gnus-thread-sort-by-subject
+                                     gnus-thread-sort-by-date))
   ;; local key bindings
   (define-key gnus-summary-mode-map (kbd "M-L") #'org-store-link)
   ;; (define-key gnus-summary-mode-map (kbd "r")
@@ -286,7 +301,7 @@ Computer Science Club of the University of Waterloo")
 Free Software Consultant
 Savoir-faire Linux
 jami:bandali")
-  (csetq
+  (setq
    gnus-message-replysign t
    gnus-posting-styles
    '((".*"
@@ -298,6 +313,12 @@ jami:bandali")
       (to "webmasters-comment@gnu.org")
       (body "")
       (eval (setq b/message-cite-say-hi nil)))
+     ("nnimap\\+kelar:.*"
+      (address "bandali@kelar.org")
+      ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")
+      (body "\nBest,\n")
+      (gcc "nnimap+kelar:Sent")
+      (eval (setq b/message-cite-say-hi t)))
      ("nnimap\\+shemshak:.*"
       (address "amin@shemshak.org")
       ("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")
@@ -332,7 +353,7 @@ jami:bandali")
 ;;                 (mml-secure-message-sign)))))
 
 (with-eval-after-load 'gnus-topic
-  (csetq
+  (setq
    gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"
    gnus-topic-topology
    `(("Gnus" visible nil nil)
@@ -343,38 +364,40 @@ jami:bandali")
         ((string= (system-name) "langa")
          '((("csc" visible nil nil))
            (("uwaterloo" visible nil nil))
+           (("kelar" visible nil nil))
            (("shemshak" visible nil nil))
            (("gnu" visible nil nil))
            (("old-gnu" visible nil nil))))))))
 
 (with-eval-after-load 'gnus-agent
-  (csetq gnus-agent-synchronize-flags 'ask))
+  (setq gnus-agent-synchronize-flags 'ask))
 
 (with-eval-after-load 'gnus-group
-  (csetq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
+  (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
 
 (with-eval-after-load 'gnus-win
-  (csetq gnus-use-full-window nil))
+  (setq gnus-use-full-window nil))
 
 (with-eval-after-load 'gnus-dired
   (add-hook 'dired-mode-hook 'gnus-dired-mode))
 
 (with-eval-after-load 'mm-decode
-  (csetq ;; mm-attachment-override-types `("text/x-diff" "text/x-patch"
-         ;;                                ,@mm-attachment-override-types)
-         mm-discouraged-alternatives '("text/html" "text/richtext")
-         mm-decrypt-option 'known
-         mm-verify-option 'known))
+  (setq
+   ;; mm-attachment-override-types `("text/x-diff" "text/x-patch"
+   ;;                                ,@mm-attachment-override-types)
+   mm-discouraged-alternatives '("text/html" "text/richtext")
+   mm-decrypt-option 'known
+   mm-verify-option 'known))
 
 (with-eval-after-load 'mm-uu
   (when (version< "27" emacs-version)
     (set-face-attribute 'mm-uu-extract nil :extend t))
   (when (version< emacs-version "27")
-    (csetq mm-uu-diff-groups-regexp ".")))
+    (setq mm-uu-diff-groups-regexp ".")))
 
 (with-eval-after-load 'mml-sec
-  (csetq mml-secure-openpgp-encrypt-to-self t
-         mml-secure-openpgp-sign-with-sender t))
+  (setq mml-secure-openpgp-encrypt-to-self t
+        mml-secure-openpgp-sign-with-sender t))
 
 (provide 'bandali-gnus)
 ;;; bandali-gnus.el ends here