From bb60074bc1784847f77321e96e13b8c0bab6df56 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 6 Feb 2019 23:08:58 -0500
Subject: [PATCH] [emacs,rc] add csclub mail

---
 init.org         | 15 ++++++++++++---
 rc.org           | 36 +++++++++++++++++++++++++++++++++++-
 var/eshell/alias |  2 +-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/init.org b/init.org
index 6877be2..ce31d58 100644
--- a/init.org
+++ b/init.org
@@ -2295,7 +2295,13 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
-             (nnimap-user "abandali@uwaterloo.ca")))
+             (nnimap-user "abandali@uwaterloo.ca"))
+     (nnimap "csclub"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@csclub.uw")))
    gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters
    '(("gnu.*"
@@ -2373,7 +2379,10 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
            (eval (setq a/message-cite-say-hi nil)))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
-           (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
+           (gcc "\"nnimap+uwaterloo:Sent Items\""))
+          ("nnimap\\+csclub:.*"
+           (address "abandali@csclub.uwaterloo.ca")
+           (gcc "nnimap+csclub:Sent")))))
 
 (use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode))
@@ -2426,7 +2435,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-dont-reply-to-names
-        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
+        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)"
         message-user-fqdn "aminb.org")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
diff --git a/rc.org b/rc.org
index 1dfdf08..f4dcf38 100644
--- a/rc.org
+++ b/rc.org
@@ -822,6 +822,31 @@ Channel uwaterloo
 Master :uwaterloo-remote:
 Slave :uwaterloo-local:
 Patterns *
+
+######
+IMAPAccount csclub
+Host mail.csclub.uwaterloo.ca
+User abandali
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub.gpg"
+SSLType IMAPS
+
+IMAPStore csclub-remote
+Account csclub
+
+IMAPAccount csclub-dovecot
+Host 127.0.0.1
+Port 143
+User abandali@csclub.uw
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub-dovecot.gpg"
+SSLType None
+
+IMAPStore csclub-local
+Account csclub-dovecot
+
+Channel csclub
+Master :csclub-remote:
+Slave :csclub-local:
+Patterns *
 #+end_src
 
 *** mbsync.service
@@ -1434,6 +1459,15 @@ user abandali
 passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+# csclub
+account csclub
+host mail.csclub.uwaterloo.ca
+tls_starttls on
+from abandali@csclub.uwaterloo.ca
+user abandali
+passwordeval gpg2 --no-tty -q -d ~/.passwd/csclub.gpg
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
 # Set a default account
 account default : aminb
 #+end_src
@@ -4380,7 +4414,7 @@ alias mv="mv -iv"
 alias cp="cp -iv"
 alias scl=systemctl
 alias jcl=journalctl
-alias m="mbsync uwaterloo; mbsync amin"
+alias m="mbsync csclub; mbsync uwaterloo; mbsync amin"
 alias best="youtube-dl -f best"
 alias sd="ssh deb"
 alias sf="ssh fp"
diff --git a/var/eshell/alias b/var/eshell/alias
index 21a533c..e086adf 100644
--- a/var/eshell/alias
+++ b/var/eshell/alias
@@ -14,4 +14,4 @@ alias up eshell-up $1
 alias pk eshell-up-peek $1
 alias vi find-file $1
 alias vim find-file $1
-alias m mbsync uwaterloo; mbsync amin
+alias m mbsync csclub; mbsync uwaterloo; mbsync amin
-- 
2.20.1