Fastmail->Purelymail & some tidying

1 files changed, 35 insertions, 81 deletions

diff --git a/.mbsyncrc b/.mbsyncrc
index 995f5df0..3eb4264e 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -1,62 +1,51 @@
-# -*- mode: conf-space; -*-
-
-# ---- defaults
-
 Create           Near
-# FastMail always expunges server-side.  mbsync author says this is a
-# really bad idea.  Let's just have mbsync expunge client-side.
-Expunge          Near
+Expunge          Both
 SyncState        *
 
-# ---- stores
-
-MaildirStore     fmmaildir
+MaildirStore     pmmaildir
 Path             ~/.fmail/
 Inbox            ~/.fmail/inbox
-# Flatten          .
-
-# Trash option doesn't seem to work.  Setting Trash to trash and
-# Expunge to Near  makes deleted mail get moved into the trash folder,
-# but it is left marked as deleted so it the FastMail IMAP server
-# won't add it to the folder, however many times mbsync tries to put
-# it there.  So just unbind deletion in mutt for now.
 
-# Trash            trash
-
-IMAPAccount      fastmail
-Host             imap.fastmail.com
-User             spwhitton@fastmail.com
-AuthMechs        LOGIN
-PassCmd          "cat ~/local/auth/fmailsyncpass"
-SSLType          IMAPS
-SSLVersions      TLSv1.2
-CertificateFile  ~/src/dotfiles/lib-src/certs/fastmail.crt
+IMAPAccount        purelymail
+Host               imap.purelymail.com
+User               spwhitton@spwhitton.name
+AuthMechs          LOGIN
+PassCmd            "cat ~/local/auth/fmailsyncpass"
+SSLType            IMAPS
+SSLVersions        TLSv1.3
 SystemCertificates no
+CertificateFile    /etc/ssl/certs/ISRG_Root_X1.pem
+
+IMAPStore        pmimap
+Account          purelymail
 
-IMAPStore        fmimap
-Account          fastmail
-# UseNamespace     no
-# PathDelimiter    .
+Channel          pmaili
+Far              :pmimap:INBOX
+Near             :pmmaildir:
 
-# ---- mailboxes
+Channel          pmails
+Far              :pmimap:Sent
+Near             :pmmaildir:sent
 
-Channel          fmaili
-Far              :fmimap:INBOX
-Near             :fmmaildir:
+Channel          pmailj
+Far              :pmimap:Junk
+Near             :pmmaildir:junk
 
-Channel          fmails
-Far              :fmimap:"Sent Items"
-Near             :fmmaildir:sent
+Channel          pmailt
+Far              :pmimap:Trash
+Near             :pmmaildir:trash
 
-# if I find myself wanting to separate listservs into different
-# folders within Lists/ on the server side (unlikely because I am
-# using notmuch), something like this should allow downloading all of
-# them without the INBOX.Lists prefix:
+# notes written on smartphone
+Channel          pmailn
+Far              :pmimap:Notes
+Near             :pmmaildir:notes
 
-# Channel        fmaill
-# Far            :fmimap:Lists/
-# Near           :fmmaildir:
-# Patterns       * !INBOX
+Group            purelymail
+Channel          pmaili
+Channel          pmails
+Channel          pmailj
+Channel          pmailt
+Channel          pmailn
 
 # So long as I'm using a mail provider that supports Sieve, can install this
 # to deliver all mail which has a List-Id into a separate Lists folder.  The
@@ -83,38 +72,3 @@ Near             :fmmaildir:sent
 #    {
 #    	keep;
 #    }
-
-# Channel          lists
-# Far              :fmimap:Lists
-# Near             :fmmaildir:lists
-
-Channel          fmailt
-Far              :fmimap:Trash
-Near             :fmmaildir:trash
-
-Channel          fmailj
-Far              :fmimap:"Junk Mail"
-Near             :fmmaildir:junk
-
-Channel          spamtraining
-Far              :fmimap:Training/Spam
-Near             :fmmaildir:spam
-
-Channel          hamtraining
-Far              :fmimap:Training/Ham
-Near             :fmmaildir:ham
-
-# notes from tablet computer / smartphone
-Channel          notes
-Far              :fmimap:Notes
-Near             :fmmaildir:notes
-
-Group            fastmail
-Channel          fmaili
-Channel          fmails
-Channel          fmailt
-# Channel          lists
-Channel          notes
-Channel          fmailj
-Channel          spamtraining
-Channel          hamtraining