From 8f3ec46381319e4ece975687704c0a3fb4dd17d0 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin@aminb.org>
Date: Thu, 18 Jan 2018 22:16:40 -0500
Subject: [PATCH] add msmtp, update isync & notmuch dots to handle my uwaterloo
 email

---
 isync/.mbsyncrc         | 22 ++++++++++++++++++++++
 msmtp/.msmtprc          | 41 +++++++++++++++++++++++++++++++++++++++++
 notmuch/.notmuch-config |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 msmtp/.msmtprc

diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc
index 9d6d94b..4bc666d 100644
--- a/isync/.mbsyncrc
+++ b/isync/.mbsyncrc
@@ -22,3 +22,25 @@ Slave :amin-local:
 Patterns * !dovecot*
 Create Both
 SyncState *
+
+######
+IMAPAccount uwaterloo
+Host connect.uwaterloo.ca
+User mbandali
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo.gpg"
+SSLType IMAPS
+
+IMAPStore uwaterloo-remote
+Account uwaterloo
+
+MaildirStore uwaterloo-local
+Path ~/mail/uwaterloo/
+Inbox ~/mail/uwaterloo/Inbox
+SubFolders Verbatim
+
+Channel uwaterloo
+Master :uwaterloo-remote:
+Slave :uwaterloo-local:
+Patterns * !dovecot*
+Create Both
+SyncState *
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
new file mode 100644
index 0000000..9bc43b8
--- /dev/null
+++ b/msmtp/.msmtprc
@@ -0,0 +1,41 @@
+# Set default values for all following accounts.
+defaults
+port 587
+tls on
+auth on
+#tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile ~/.msmtp.log
+
+# aminb
+account aminb
+host nix.aminb.org
+tls_fingerprint BB:98:B3:02:83:B0:E0:C3:49:3E:C2:B2:A8:60:62:78:03:B3:5D:B3:BD:B8:0A:39:BB:E4:B0:66:D1:CF:D1:6B
+tls_starttls on
+from amin@aminb.org
+user amin@aminb.org
+passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
+
+# gnu
+account gnu
+host fencepost.gnu.org
+tls_fingerprint 94:0E:37:EB:EA:44:5A:4B:B6:6F:16:3D:6C:7E:7E:44:2D:93:61:C1:FE:82:A8:29:5E:3C:12:4E:2D:BE:0E:2C
+tls_starttls on
+from aminb@gnu.org
+user aminb
+passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+
+# uwaterloo
+account uwaterloo
+host connect.uwaterloo.ca
+tls_starttls on
+from mbandali@uwaterloo.ca
+user mbandali
+passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
+# uwaterloo (friendly address)
+account uwaterloo-friendly : uwaterloo
+from amin.bandali@uwaterloo.ca
+
+# Set a default account
+account default : aminb
diff --git a/notmuch/.notmuch-config b/notmuch/.notmuch-config
index 2f10cd2..83af4a7 100644
--- a/notmuch/.notmuch-config
+++ b/notmuch/.notmuch-config
@@ -31,7 +31,7 @@ path=/home/amin/mail
 [user]
 name=Amin Bandali
 primary_email=amin@aminb.org
-other_email=aminb@gnu.org;
+other_email=amin.bandali@uwaterloo.ca;mbandali@uwaterloo.ca;aminb@gnu.org;
 
 # Configuration for "notmuch new"
 #
-- 
2.20.1