From 2786a0cdc1953b90ed73e90242882ac8a71b41c9 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Tue, 21 Jul 2020 09:30:11 -0400
Subject: [PATCH] Various email-related changes

---
 lisp/bandali-gnus.el | 31 ++++++++++++++++++++-----------
 var/eshell/alias     |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/lisp/bandali-gnus.el b/lisp/bandali-gnus.el
index 2bfa816..180e82a 100644
--- a/lisp/bandali-gnus.el
+++ b/lisp/bandali-gnus.el
@@ -58,7 +58,7 @@
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
-             (nnimap-user "amin@shemshak.local"))
+             (nnimap-user "bandali@shemshak.local"))
      (nnimap "gnu"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
@@ -76,6 +76,8 @@
                                   (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
                                   ;; libreplanet
                                   (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
+                                  ;; iana (e.g. tz-announce)
+                                  (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
                                   ;; *.lists.sr.ht, omitting one dot if present
                                   ;;    add more \\.?\\([^.]*\\) if needed
                                   (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
@@ -95,12 +97,12 @@
                                   ("X-Spam_action" "reject" "Junk")
                                   ;; otherwise, leave mail in INBOX
                                   "INBOX")))
-     (nnimap "uw"
+     (nnimap "uwaterloo"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
-             (nnimap-user "abandali@uw.local")
+             (nnimap-user "abandali@uwaterloo.local")
              (nnimap-inbox "INBOX")
              (nnimap-split-methods 'nnimap-split-fancy)
              (nnimap-split-fancy (|
@@ -115,7 +117,14 @@
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
-             (nnimap-user "abandali@csc.uw.local")))
+             (nnimap-user "abandali@csclub.uwaterloo.local")
+             (nnimap-inbox "INBOX")
+             (nnimap-split-methods 'nnimap-split-fancy)
+             (nnimap-split-fancy (|
+                                  ;; spam
+                                  ("X-Spam-Flag" "YES" "Junk")
+                                  ;; catch-all
+                                  "INBOX"))))
    gnus-message-archive-group "nnimap+gnu:INBOX"
    gnus-parameters
    '(("l\\.atreus"
@@ -252,7 +261,7 @@
       (gcc-self . t))
      ("l\\."
       (subscribed . t))
-     ("nnimap\\+uw:.*"
+     ("nnimap\\+uwaterloo:.*"
       (gcc-self . t)))
    gnus-large-newsgroup  50
    gnus-home-directory   (b/var "gnus/")
@@ -354,10 +363,10 @@
   :config
   (defvar b/shemshak-signature "Amin Bandali
 https://shemshak.org/~amin")
-  (defvar b/uw-signature "Amin Bandali, MMath Student
+  (defvar b/uwaterloo-signature "Amin Bandali, MMath Candidate
 Cheriton School of Computer Science
 University of Waterloo
-https://bandali.eu.org")
+https://bndl.org")
   (defvar b/csc-signature "Amin Bandali
 System Administrator, Systems Committee
 Computer Science Club, University of Waterloo
@@ -380,12 +389,12 @@ https://csclub.uwaterloo.ca/~abandali")
            (signature b/shemshak-signature)
            (gcc "nnimap+shemshak:Sent")
            (eval (setq b/message-cite-say-hi t)))
-          ("nnimap\\+uw:.*"
+          ("nnimap\\+uwaterloo:.*"
            (address "bandali@uwaterloo.ca")
            (body "\nBest,\n")
-           (signature b/uw-signature))
-          ("nnimap\\+uw:INBOX"
-           (gcc "\"nnimap+uw:Sent Items\""))
+           (signature b/uwaterloo-signature))
+          ("nnimap\\+uwaterloo:INBOX"
+           (gcc "\"nnimap+uwaterloo:Sent Items\""))
           ("nnimap\\+csc:.*"
            (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
diff --git a/var/eshell/alias b/var/eshell/alias
index d80c00b..a5109a4 100644
--- a/var/eshell/alias
+++ b/var/eshell/alias
@@ -16,4 +16,4 @@ alias vi find-file $1
 alias vim find-file $1
 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $*
 alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $*
-alias m mbsync csclub; mbsync uwaterloo; mbsync shemshak; getmail
+alias m mbsync csclub; mbsync uwaterloo; mbsync shemshak; mbsync gnub; getmail
-- 
2.20.1