Simplify email setup

3 files changed, 9 insertions, 116 deletions

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 69093c4..5330685 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1217,40 +1217,6 @@ With two prefix arguments, write out the day and month name."
                   mu4e-contexts
                   (list
                    (make-mu4e-context
-                    :name "Personal"
-                    :match-func (lambda (msg)
-                                  (when msg
-                                    (mu4e-message-contact-field-matches
-                                     msg :to "alan@alanpearce\..*")))
-                    :vars `((user-mail-address . "alan@alanpearce.eu")
-                            (mu4e-sent-messages-behavior . sent)
-                            (mu4e-sent-folder . "/personal/alanpearce/Sent")
-                            (mu4e-drafts-folder . "/personal/alanpearce/Drafts")
-                            (mu4e-refile-folder . "/personal/alanpearce/Archive")
-                            (mu4e-trash-folder . "/personal/alanpearce/Trash")
-                            (mu4e-maildir-shortcuts . (("/personal/alanpearce/INBOX" . ?i)
-                                                       ("/personal/alanpearce/Archive" . ?a)
-                                                       ("/personal/alanpearce/Sent" . ?s)
-                                                       ("/personal/alanpearce/Junk" . ?p)
-                                                       ("/personal/alanpearce/Orders" . ?r)))
-                            ))
-                   (make-mu4e-context
-                    :name "Riseup"
-                    :match-func (lambda (msg)
-                                  (when msg
-                                    (mu4e-message-contact-field-matches
-                                     msg :to "alanpearce@riseup.net")))
-                    :vars `((user-mail-address . "alanpearce@riseup.net")
-                            (mu4e-sent-messages-behavior . sent)
-                            (mu4e-sent-folder . "/personal/riseup/Sent")
-                            (mu4e-drafts-folder . "/personal/riseup/Drafts")
-                            (mu4e-refile-folder . "/personal/riseup/Archive")
-                            (mu4e-trash-folder . "/personal/riseup/Trash")
-                            (mu4e-maildir-shortcuts . (("/personal/riseup/INBOX" . ?i)
-                                                       ("/personal/riseup/Archive" . ?a)
-                                                       ("/personal/riseup/Sent" . ?s)
-                                                       ("/personal/riseup/Spam" . ?p)))))
-                   (make-mu4e-context
                     :name "Satoshipay"
                     :match-func (lambda (msg)
                                   (when msg
@@ -1265,15 +1231,7 @@ With two prefix arguments, write out the day and month name."
                             (mu4e-maildir-shortcuts . (("/satoshipay/INBOX" . ?i)
                                                        ("/satoshipay/[Gmail]/All Mail" . ?a)
                                                        ("/satoshipay/[Gmail]/Sent Mail" . ?s)
-                                                       ("/satoshipay/[Gmail]/Spam" . ?p))))))
-                  mu4e-user-mail-address-list (append
-                                               (delq nil
-                                                     (mapcar (lambda (context)
-                                                               (when (mu4e-context-vars context)
-                                                                 (cdr (assq 'user-mail-address (mu4e-context-vars context)))))
-                                                             mu4e-contexts))
-                                               '("alan@alanpearce.uk"
-                                                 "alan@alanpearce.co.uk")))
+                                                       ("/satoshipay/[Gmail]/Spam" . ?p)))))))
             (define-hook-helper mu4e-view-mode ()
               ;; try to emulate some of the eww key-bindings
               (local-set-key (kbd "<tab>") 'shr-next-link)
diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc
index f05e907..09286ba 100644
--- a/isync/.mbsyncrc
+++ b/isync/.mbsyncrc
@@ -4,58 +4,6 @@ Remove Both
 Expunge Both
 CopyArrivalDate yes
 
-## Personal
-# Account
-IMAPAccount alanpearce.eu
-Host mail.alanpearce.eu
-User alan@alanpearce.eu
-PassCmd "pass show mail/alanpearce.eu"
-SSLType IMAPS
-SSLVersions TLSv1.2 TLSv1.1
-
-# Remote
-IMAPStore alanpearce.eu-remote
-Account alanpearce.eu
-
-# Local
-MaildirStore alanpearce.eu-local
-Path ~/mail/personal/alanpearce/
-Inbox ~/mail/personal/alanpearce/INBOX
-SubFolders Verbatim
-
-# Job
-Channel personal
-Master :alanpearce.eu-remote:
-Slave :alanpearce.eu-local:
-Patterns *
-SyncState *
-
-## Riseup
-# Account
-IMAPAccount riseup.net
-Host mail.riseup.net
-User alanpearce
-PassCmd "pass show mail/riseup.net"
-SSLType IMAPS
-SSLVersions TLSv1.2 TLSv1.1
-
-# Remote
-IMAPStore riseup.net-remote
-Account riseup.net
-
-# Local
-MaildirStore riseup.net-local
-Path ~/mail/personal/riseup/
-Inbox ~/mail/personal/riseup/INBOX
-SubFolders Verbatim
-
-# Job
-Channel riseup
-Master :riseup.net-remote:
-Slave :riseup.net-local:
-Patterns *
-SyncState *
-
 ## Satoshipay
 # Account
 IMAPAccount satoshipay.io
@@ -81,3 +29,10 @@ Master :satoshipay.io-remote:
 Slave :satoshipay.io-local:
 Patterns * "[Gmail]*"
 SyncState *
+
+Channel satoshipay-rubbish
+Master :satoshipay.io-remote:
+Slave :satoshipay.io-local:
+Patterns "[Gmail]/Bin"
+Create Both
+Expunge Both
\ No newline at end of file
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 068febc..401d19e 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -5,26 +5,6 @@ tls            on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile        ~/.local/log/msmtp.log
 
-account        personal
-host           mail.alanpearce.eu
-port           587
-from           alan@alanpearce.eu
-user           alan@alanpearce.eu
-passwordeval   pass mail/alanpearce.eu
-
-account        personal-uk : personal
-from           alan@alanpearce.uk
-
-account        personal-co-uk : personal
-from           alan@alanpearce.co.uk
-
-account        riseup
-host           mail.riseup.net
-from           alanpearce@riseup.net
-user           alanpearce
-port           465
-passwordeval   pass mail/riseup.net
-
 account        satoshipay
 host           smtp.gmail.com
 from           alan@satoshipay.io
@@ -34,4 +14,4 @@ tls_starttls   off
 passwordeval   pass satoshipay/google/app-mail
 
 # Set a default account
-account default : personal
+account default : satoshipay