From f3c4487c6c79880ec5ae3a6eda485c6825e95984 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 13 Sep 2023 21:48:05 -0400
Subject: Some Gnus tweaks

---
 .emacs.d/init.el              |  2 ++
 .emacs.d/lisp/bandali-gnus.el | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 1383003..c3c9d1e 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -633,6 +633,8 @@ for all frames."
 (setq shr-max-width 80)
 
 ;; Email (with Gnus, message, and smtpmail)
+;; (with-eval-after-load 'sendmail
+;;   (setq mail-header-separator ""))
 (require 'bandali-gnus)
 (require 'bandali-message)
 ;; (with-eval-after-load 'smtpmail
diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index fa05a00..75ecab6 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -60,7 +60,14 @@
           (nnimap-address "127.0.0.1")
           (nnimap-server-port 143)
           (nnimap-authenticator plain)
-          (nnimap-user "bandali@kelar.local"))
+          (nnimap-user "bandali@kelar.local")
+          (nnimap-inbox "INBOX")
+          (nnimap-split-methods 'nnimap-split-fancy)
+          (nnimap-split-fancy
+           (|
+            ("subject" "nagios-fsf:.*" "nagios-fsf")
+            ;; otherwise, leave mail in INBOX
+            "INBOX")))
          (nnimap
           "shemshak"
           (nnimap-stream plain)
@@ -91,7 +98,10 @@
             (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
             ;; fsf
             (list ".*<\\(.*\\)\\.fsf\\.org>.*" "l.\\1")
+            ;; cfarm
+            (from "cfarm-.*@lists\\.tetaneutral\\.net" "l.cfarm")
             ;; debian
+            (list ".*<\\(.*\\)\\.\\(lists\\|other\\)\\.debian\\.org>.*" "l.\\1")
             (list ".*<\\(.*\\)\\.alioth-lists\\.debian\\.net>.*" "l.\\1")
             ;; gnus
             (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
@@ -113,7 +123,6 @@
             ;; webmasters
             (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
             ;; other
-            ("subject" "nagios-fsf:.*" "nagios-fsf")
             (list ".*atreus.freelists.org" "l.atreus")
             (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
             ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
@@ -282,11 +291,11 @@
 
 (defvar b/sfl-p nil)
 (with-eval-after-load 'gnus-msg
-  (let ((bandali "Amin Bandali (https://kelar.org/~bandali)"))
+  (let ((bandali "Amin Bandali%s - https://www.gnu.ca/~bandali/"))
     (defvar b/csc-signature
       (mapconcat
        #'identity
-       `(,bandali
+       `(,(format bandali ", MMath")
          "Systems Committee <syscom@csclub.uwaterloo.ca>"
          "Computer Science Club of the University of Waterloo")
        "\n"))
@@ -296,7 +305,8 @@
        `(,bandali
          "Volunteer, Savoir-faire Linux"
          "jami:bandali")
-       "\n")))
+       "\n")
+      ""))                              ; the "" is for bandali's %s
   (setq
    gnus-message-replysign t
    gnus-posting-styles
@@ -357,7 +367,7 @@
            (("kelar" visible nil nil))
            (("shemshak" visible nil nil))
            (("gnu" visible nil nil))
-           (("old-gnu" visible nil nil))
+           ;(("old-gnu" visible nil nil))
            (("sfl" visible nil nil)))))))
 
 (with-eval-after-load 'gnus-agent
-- 
cgit v1.2.3-60-g2f50