Fastmail->Purelymail & some tidying

6 files changed, 45 insertions, 132 deletions

diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 2825f7ec..25e097be 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -29,7 +29,7 @@ unset crypt_use_gpgme		# Some Debian services require inline sigs.
 unset mark_old			# Better with mbsync.
 unset wait_key
 
-mailboxes +inbox +notes +sent +ham +spam +junk +trash
+mailboxes +inbox +notes +sent +junk +trash
 
 ignore *
 unignore From: Subject: To: Cc: Date: Reply-To: Message-Id:
diff --git a/.config/notmuch/default/hooks/post-new b/.config/notmuch/default/hooks/post-new
index b46d08bd..1774b148 100755
--- a/.config/notmuch/default/hooks/post-new
+++ b/.config/notmuch/default/hooks/post-new
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # mark all spam as spam, and as read, for Gnus
-notmuch tag -unread +spam -- folder:junk folder:spam
+notmuch tag -unread +spam -- folder:junk
 
 # mark all trash as trash, and as read, for Gnus
 notmuch tag -unread +deleted -- folder:trash
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 598c619b..de4315ef 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3880,21 +3880,21 @@ unread."
     (gnus-summary-goto-article article)))
 (advice-add 'org-gnus-follow-link :around #'spw/org-gnus-follow-link)
 
-(defun spw/gnus-fastmail-trash (n)
+(defun spw/gnus-purelymail-trash (n)
   (interactive "p")
   (gnus-summary-move-article n "nnmaildir+fmail:trash"))
 (with-eval-after-load 'gnus-sum
   (define-key gnus-summary-mode-map
-	      [remap gnus-summary-delete-article] #'spw/gnus-fastmail-trash))
+	      [remap gnus-summary-delete-article] #'spw/gnus-purelymail-trash))
 
-(defun spw/gnus-fastmail-learn-spam (n)
+(defun spw/gnus-purelymail-learn-spam (n)
   (interactive "p")
   (save-excursion (gnus-summary-mark-forward n))
-  (gnus-summary-move-article n "nnmaildir+fmail:spam")
+  (gnus-summary-move-article n "nnmaildir+fmail:junk")
   (gnus-summary-next-unread-article))
 (with-eval-after-load 'gnus-sum
-  (define-key gnus-summary-mode-map [f5] #'spw/gnus-fastmail-learn-spam)
-  (define-key gnus-summary-mode-map "\C-z\C-s" #'spw/gnus-fastmail-learn-spam))
+  (define-key gnus-summary-mode-map [f5] #'spw/gnus-purelymail-learn-spam)
+  (define-key gnus-summary-mode-map "\C-z\C-s" #'spw/gnus-purelymail-learn-spam))
 
 
 ;;;; rcirc
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
diff --git a/bin/movemymail b/bin/movemymail
index fbe76178..06671043 100755
--- a/bin/movemymail
+++ b/bin/movemymail
@@ -45,11 +45,11 @@ if (hostfqdn eq "athena.silentflame.com") {
     system "imap-dl", "$ENV{HOME}/.config/mailscripts/imap-dl.gmail";
 }
 
-eval { system "mbsync", "fastmail" };
+eval { system "mbsync", "purelymail" };
 if (my $exception = $@) {
     local $ENV{XDG_RUNTIME_DIR} = "/run/user/$<";
     system "notify-send", "--urgency=critical", "--icon=dialog-warning",
-      "'mbsync fastmail' exited nonzero";
+      "'mbsync purelymail' exited nonzero";
     die $exception;
 }
 
diff --git a/lib-src/certs/fastmail.crt b/lib-src/certs/fastmail.crt
deleted file mode 100644
index ce40ed30..00000000
--- a/lib-src/certs/fastmail.crt
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHQDCCBiigAwIBAgIQDIVbcGvDCrksnNDtiwrz5zANBgkqhkiG9w0BAQsFADBZ
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypE
-aWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMx
-MDA0MDAwMDAwWhcNMjQxMTAxMjM1OTU5WjBoMQswCQYDVQQGEwJBVTERMA8GA1UE
-CBMIVmljdG9yaWExEjAQBgNVBAcTCU1lbGJvdXJuZTEZMBcGA1UEChMQRmFzdE1h
-aWwgUHR5IEx0ZDEXMBUGA1UEAwwOKi5mYXN0bWFpbC5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIK7bTmFkD3zDvFKpT6h2CRrTgKa+cnZ7zToRQ
-VdREXU+wDaqccWbihBR0sGhYeoUfqkjQfrFMyqK/FrGEB/ZWyxAx6q5HFnBQTuQV
-q2Cdf08lo+eLdGIOl+ojV2OVIA+C88z/Pfvj8Peqo13b/LpKoWDxsMEeR1CfW3yX
-oEVi/avIc2U0yoZ6YfqGQ9U/QX2gQMD1GqA1BIiCfxUr7bZxtAyL19y+Z87EtL9d
-GGTBV+Gjh/DyATMmy1kwLcoZXT3Gnieq2ensqROUxpQ2Y0U7iww55kU86Clx9KnR
-KqsWJGwbLtpQ+NFFbyDC/5tTTR6iNbetOGcPA6xpnsbFgI4TAgMBAAGjggPzMIID
-7zAfBgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4EFgQUA9QH
-pLBlScA8j+iaCIfKtcdi5/owgYEGA1UdEQR6MHiCDiouZmFzdG1haWwuY29tggxm
-YXN0bWFpbC5jb22CFSouY2FsZGF2LmZhc3RtYWlsLmNvbYIWKi5jYXJkZGF2LmZh
-c3RtYWlsLmNvbYITY2FsZGF2LmZhc3RtYWlsLmNvbYIUY2FyZGRhdi5mYXN0bWFp
-bC5jb20wPgYDVR0gBDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDov
-L3d3dy5kaWdpY2VydC5jb20vQ1BTMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDov
-L2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYy
-MDIwQ0ExLTEuY3JsMEigRqBEhkJodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGln
-aUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1NjIwMjBDQTEtMS5jcmwwgYcGCCsGAQUF
-BwEBBHsweTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFEG
-CCsGAQUFBzAChkVodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
-bG9iYWxHMlRMU1JTQVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCC
-AX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHYA7s3QZNXbGs7FXLedtM0TojKHRny8
-7N7DUUhZRnEftZsAAAGK+6wcvgAABAMARzBFAiA1ar7gEFUKD92a7bFkHwfpr7+p
-cMteU3TFN/cAI5gQjQIhANlbUK6ZblyoqFpkwCKNh2K58PykaD0bhnVbAZm0GNTp
-AHUASLDja9qmRzQP5WoC+p0w6xxSActW3SyB2bu/qznYhHMAAAGK+6wcugAABAMA
-RjBEAiAeKRWzn6XRdBByYajuV0IXKIXgbBnDd2ENiQ6kG1IwjgIgOz5x3UUwkSDP
-UZtmUJQtxhJ/i3ILE0F7IxQO6b+ENx0AdwDatr9rP7W2Ip+bwrtca+hwkXFsu1GE
-hTS9pD0wSNf7qwAAAYr7rBymAAAEAwBIMEYCIQCwbOuNCRajD/F6G3282N7bUUZL
-S4xKCxuZ13jubGtnOQIhAMMAO2kzNNtvSo7ST2dxiQ9BUR1ynMSfujEwRCgcWpia
-MA0GCSqGSIb3DQEBCwUAA4IBAQAait3EVZ7lQG8hkwLWJ8Jb0o1k+A51l0os8f/n
-l3e5c3OlQztLhsjTwrJjuWVBPPH2ckyAqlu/nb1ZAoaK9r/6AhYVVMSkgE+VKzQH
-n0H7FECB7agejypxXSxu9oqD/3bg+m7spM+vfBuOu9nAmJY7b+CGrbCrgiYomG8n
-ELgz8t4U2oVhpHX1B6vO3e/wUjFjH9otSRz3hFr6D6YyV4nLyNofSQs9K8Mcbf/w
-/KgvcnN2csFHkRmYBMb96Jtdj58nydsu/Cwyhru39SN1gkXpWL8L6p28TOqZlssb
-kV289dZ2GuIsRAoaTWE5qtlMVmr/KknKqgaO/o+rLlagFiWh
------END CERTIFICATE-----