From a18ada98e45dc85a9ecd271ebe5ceb4567501a9d Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <me@sanchayanmaity.net>
Date: Tue, 29 Oct 2024 11:38:27 +0530
Subject: [PATCH] mbsync/msmtp/notmuch: Add email accounts for our own domains

Switch to Migadu for our own domains. Migadu mandates
bringing your own domain for email and as such we can
now have separate mail boxes for both our .com & .net
domains. We will drop fastmail once our plan expires.
---
 mbsync/.mbsyncrc        | 54 ++++++++++++++++++++++++++++++++++++++++-
 msmtp/.msmtprc          | 14 ++++++++++-
 notmuch/.notmuch-config |  6 ++---
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 6d13bbc..714c8d1 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -2,6 +2,58 @@ Create Near
 Expunge Both
 SyncState *
 
+IMAPAccount sanchayan-net
+Host imap.migadu.com
+Port 993
+User me@sanchayanmaity.net
+PassCmd "pass show migadu/sanchayanmaity.net"
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore sanchayan-net-remote
+Account sanchayan-net
+
+MaildirStore sanchayan-net-local
+SubFolders Verbatim
+Path "~/Mail/sanchayan-net/"
+Inbox "~/Mail/sanchayan-net/Inbox"
+
+Channel sanchayan-net
+Far :sanchayan-net-remote:
+Near :sanchayan-net-local:
+Patterns *
+Expunge None
+CopyArrivalDate yes
+Sync All
+Create Near
+SyncState *
+
+IMAPAccount sanchayan-com
+Host imap.migadu.com
+Port 993
+User me@sanchayanmaity.com
+PassCmd "pass show migadu/sanchayanmaity.com"
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore sanchayan-com-remote
+Account sanchayan-com
+
+MaildirStore sanchayan-com-local
+SubFolders Verbatim
+Path "~/Mail/sanchayan-com/"
+Inbox "~/Mail/sanchayan-com/Inbox"
+
+Channel sanchayan-com
+Far :sanchayan-com-remote:
+Near :sanchayan-com-local:
+Patterns *
+Expunge None
+CopyArrivalDate yes
+Sync All
+Create Near
+SyncState *
+
 IMAPAccount fastmail
 Host imap.fastmail.com
 Port 993
@@ -47,7 +99,7 @@ Inbox "~/Mail/asymptotic/Inbox"
 Channel asymptotic
 Far :asymptotic-remote:
 Near :asymptotic-local:
-Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail"
+Patterns * !Sent !Trash ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail"
 
 IMAPAccount gmail
 Host imap.gmail.com
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 9471726..9d57595 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -7,9 +7,21 @@ auth on
 tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account        sanchayan-net
+host           smtp.migadu.com
+from           me@sanchayanmaity.net
+user           me@sanchayanmaity.net
+passwordeval   "pass show migadu/sanchayanmaity.net"
+
+account        sanchayan-com
+host           smtp.migadu.com
+from           me@sanchayanmaity.com
+user           me@sanchayanmaity.com
+passwordeval   "pass show migadu/sanchayanmaity.com"
+
 account        fastmail
 host           smtp.fastmail.com
-from           sanchayan@sanchayanmaity.net
+from           maitysanchayan@fastmail.com
 user           maitysanchayan@fastmail.com
 passwordeval   "pass show apppass/fastmail"
 
diff --git a/notmuch/.notmuch-config b/notmuch/.notmuch-config
index 9c70f5b..c11bace 100644
--- a/notmuch/.notmuch-config
+++ b/notmuch/.notmuch-config
@@ -30,8 +30,8 @@ path=Mail
 #
 [user]
 name=Sanchayan Maity
-primary_email=maitysanchayan@fastmail.com
-other_email=maitysanchayan@gmail.com;sanchayan@asymptotic.io
+primary_email=me@sanchayanmaity.net
+other_email=me@sanchayanmaity.com,maitysanchayan@fastmail.com,maitysanchayan@gmail.com;sanchayan@asymptotic.io
 
 # Configuration for "notmuch new"
 #
@@ -49,7 +49,7 @@ other_email=maitysanchayan@gmail.com;sanchayan@asymptotic.io
 #
 [new]
 tags=N;
-ignore=mutt_cache;.mbsyncstate;.mbsyncstate.lock;.uidvalidity
+ignore=.mutt;.mbsyncstate;.mbsyncstate.lock;.uidvalidity;Junk;Spam;Trash
 
 # Search configuration
 #