Purelymail!

4 files changed, 76 insertions, 30 deletions

diff --git a/mbsyncrc b/mbsyncrc
new file mode 100644
index 0000000..38a0d47
--- /dev/null
+++ b/mbsyncrc
@@ -0,0 +1,28 @@
+SyncState *
+Sync Pull All Push All
+
+IMAPAccount mrlemon@purelymail.com
+Host imap.purelymail.com
+Port 993
+User mrlemon@purelymail.com
+PassCmd "echo $(pass purelymail_neomutt)"
+SSLType IMAPS
+
+IMAPStore purelymail-remote
+Account mrlemon@purelymail.com
+UseNamespace yes
+
+MaildirStore purelymail-local
+SubFolders Verbatim
+Inbox ~/.mail/purelymail/INBOX
+Path ~/.mail/purelymail/
+Flatten .
+
+Channel purelymailchannel
+Far :purelymail-remote:
+Near :purelymail-local:
+Patterns *
+Create Both
+Expunge Both
+SyncState *
+    
diff --git a/msmtprc b/msmtprc
index d335c19..1754d3f 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,6 +1,6 @@
-account matthewlemon
+account purelymail
 #host mail.messagingengine.com
-host smtp.fastmail.com
+host smtp.purelymail.com
 from matt@matthewlemon.com
 tls on
 tls_certcheck off
@@ -8,9 +8,10 @@ tls_starttls off
 #tls_trust_file /etc/ssl/certs/ca-certificates.crt
 port 465
 auth on
-user mrlemon@mailforce.net
+user mrlemon@purelymail.com
+passwordeval pass purelymail_neomutt
 #passwordeval python2 -c "import keyring; print keyring.get_password('fastmail', 'matthewlemon')"
-passwordeval pass evolution_email_fastmail
+#passwordeval pass evolution_email_fastmail
 #passwordeval gpg --no-tty -q -d /home/lemon/.password-store/Email/fastmail.gpg
 #passwordeval gpg -d /home/lemon/.password-store/Email/fastmail.gpg
 logfile ~/.msmtp.log
@@ -26,4 +27,4 @@ logfile ~/.msmtp.log
 #tls_trust_file /etc/ssl/certs/ca-certificates.crt
 #passwordeval pass Email/gmail-application
 
-account default : matthewlemon
+account default : purelymail
diff --git a/muttrc b/muttrc
index fed0b11..6ad4c06 100644
--- a/muttrc
+++ b/muttrc
@@ -60,7 +60,7 @@ hdr_order from: to: cc: bcc: date: subject:  # and in this order
 # Account Settings -----------------------------------
 
 # Default inbox.
-set spoolfile = "+matt-matthewlemon.com/INBOX"
+set spoolfile = "+purelymail/INBOX"
 #set spoolfile = "+INBOX"
 
 # Alternate email addresses.
@@ -70,24 +70,23 @@ set spoolfile = "+matt-matthewlemon.com/INBOX"
 
 subscribe announce@openbsd.org
 
-named-mailboxes Inbox +matt-matthewlemon.com/INBOX \
-	  Sent +matt-matthewlemon.com/Sent \
-	  Archive +matt-matthewlemon.com/Archive \
-      Drafts +matt-matthewlemon.com/Drafts \
-      # Archive.2020 +matt-matthewlemon.com/Archive.2020 \
-      # Sent.2020 +matt-matthewlemon.com/Sent.2020 \
-      Trash +matt-matthewlemon.com/Trash
-
-# mailboxes +matt-matthewlemon.com/INBOX \
-#           +matt-matthewlemon.com/INBOX.Archive \
-#           +matt-matthewlemon.com/INBOX.Sent\ Items \
-#           +matt-matthewlemon.com/INBOX.Drafts \
-#           +matt-matthewlemon.com/INBOX.Trash \
+named-mailboxes Inbox +purelymail/INBOX \
+	  Sent +purelymail/Sent \
+	  Archive +purelymail/Archive \
+	  Subscriptions +purelymail/Subscriptions \
+      Drafts +purelymail/Drafts \
+      Trash +purelymail/Trash
+
+# mailboxes purelymail/INBOX \
+#           purelymail/INBOX.Archive \
+#           purelymail/INBOX.Sent\ Items \
+#           purelymail/INBOX.Drafts \
+#           purelymail/INBOX.Trash \
 #mailboxes +INBOX +INBOX.Archive +INBOX.Sent\ Items +INBOX.Drafts +INBOX.Trash
 
 # Other special folders.
-set mbox      = "+matt-matthewlemon.com/INBOX.Archive"
-set postponed = "+matt-matthewlemon.com/INBOX.Drafts"
+set mbox      = "purelymail/INBOX.Archive"
+set postponed = "purelymail/INBOX.Drafts"
 
 # Index View Options ---------------------------------
 set date_format = "%d-%m-%Y"
@@ -113,9 +112,9 @@ macro index,pager \cb <pipe-entry>'urlview'<enter> 'Follow links with urlview'
 macro attach,compose \cb <pipe-entry>'urlview'<enter> 'Follow links with urlview'
 
 # Folder Shortcuts
-macro index Ei '<change-folder>+matt-matthewlemon.com/INBOX<enter>' 'Go to Inbox'
-macro index Ea '<change-folder>+matt-matthewlemon.com/Archive<enter>' 'Go to Archive'
-macro index Es '<change-folder>+matt-matthewlemon.com/Sent<enter>' 'Go to Sent Mail'
+macro index Ei '<change-folder>purelymail/INBOX<enter>' 'Go to Inbox'
+macro index Ea '<change-folder>purelymail/Archive<enter>' 'Go to Archive'
+macro index Es '<change-folder>purelymail/Sent<enter>' 'Go to Sent Mail'
 
 # Navigate threads
 bind index { previous-thread
@@ -131,8 +130,8 @@ bind index <space>  collapse-thread
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
 # Sync email
-macro index O "<shell-escape>offlineimap<enter>"           "run offlineimap to sync all mail"
-macro index o "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
+macro index O "<shell-escape>clear && mbsync -a<enter>"           "run mbsync to sync all mail"
+#macro index o "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
 
 # Saner copy/move dialogs
 macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
@@ -194,9 +193,9 @@ set forward_quote                    # include message in forwards
 set editor = "vim %s"
 
 set from     = "matt@matthewlemon.com"
-set sendmail = "/usr/bin/msmtp -a matthewlemon"
+set sendmail = "/usr/bin/msmtp -a purelymail"
 set sendmail_wait = 0
-set record = "+matt-matthewlemon.com/Sent"
+set record = "+purelymail/Sent"
 
 #bind compose p postpone-message
 #bind index p recall-message
@@ -225,7 +224,7 @@ bind pager N search-opposite
 macro index a "<limit>all\n" "show all messages (undo limit)"
 
 # get an email from mutt to taskwarrior
-macro index T "<pipe-message>mutt2task<enter> <move-message>+matt-matthewlemon.com/INBOX.Archive<enter>"
+macro index T "<pipe-message>mutt2task<enter> <move-message>purelymail/INBOX.Archive<enter>"
 
 # Handle searching using notmuch (see Steve Losh article)
 # this doesn't work on linux so using another macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py.py ~/.mail/temporary/search<enter><change-folder-readonly>+temporary/search<enter>" "search mail (using notmuch)"
diff --git a/offlineimaprc b/offlineimaprc
index da7918b..6f11da1 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,10 +1,15 @@
 [general]
 ui = TTY.TTYUI
 #accounts = MatthewLemon, Gmail
-accounts = MatthewLemon
+accounts = MatthewLemon, purelymail
 pythonfile=~/.offlineimap.py
 fsync = False
 
+[Account purelymail]
+localrepository = purelymail-local
+remoterepository = purelymail-remote
+
+
 [Account MatthewLemon]
 localrepository = MatthewLemon-Local
 remoterepository = MatthewLemon-Remote
@@ -20,6 +25,19 @@ localfolders = ~/.mail/matt-matthewlemon.com
 #  				'inbox': '/Inbox',
 #  				}.get(folder, folder)
 
+[Repository purelymail-local]
+type = Maildir
+localfolders = ~/.mail/purelymail
+
+[Repository purelymail-remote]
+maxconnections = 3
+type = IMAP
+remotehost = imap.purelymail.com
+sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+remoteuser = mrlemon@purelymail.com
+remotepasseval = get_pass("purelymail_neomutt") 
+
+
 [Repository MatthewLemon-Remote]
 #cert_fingerprint = 54137524fe721f0cbb8a6a0e1e280ade50482e29
 maxconnections = 3