Various mail-related updates and cleanups

[~bandali/configs] / .config / isync / mbsyncrc

diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index 42c056c..25a2a08 100644 (file)
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -79,31 +79,6 @@ Master :gnub-remote:
 Slave :gnub-local:
 Patterns *
 
-######
-IMAPAccount uwaterloo
-Host connect.uwaterloo.ca
-User abandali
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/uwaterloo.gpg"
-SSLType IMAPS
-
-IMAPStore uwaterloo-remote
-Account uwaterloo
-
-IMAPAccount uwaterloo-local
-Host 127.0.0.1
-Port 143
-User abandali@uwaterloo.local
-PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/uwaterloo-local.gpg"
-SSLType None
-
-IMAPStore uwaterloo-local
-Account uwaterloo-local
-
-Channel uwaterloo
-Master :uwaterloo-remote:
-Slave :uwaterloo-local:
-Patterns *
-
 ######
 IMAPAccount csclub
 Host mail.csclub.uwaterloo.ca
@@ -128,3 +103,28 @@ Channel csclub
 Master :csclub-remote:
 Slave :csclub-local:
 Patterns *
+
+######
+IMAPAccount canonical
+Host mail.canonical.com
+User bandali
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/canonical.gpg"
+SSLType IMAPS
+
+IMAPStore canonical-remote
+Account canonical
+
+IMAPAccount canonical-local
+Host 127.0.0.1
+Port 143
+User bandali@canonical.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/canonical-local.gpg"
+SSLType None
+
+IMAPStore canonical-local
+Account canonical-local
+
+Channel canonical
+Master :canonical-remote:
+Slave :canonical-local:
+Patterns *