mutt: set up second wired@scottgilbertson.net account

5 files changed, 104 insertions, 82 deletions

diff --git a/.msmtprc b/.msmtprc
index 53b3531..842b234 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -1,18 +1,22 @@
-account sng@luxagraf.net
-host echo.mxrouting.net
+defaults
 port 587
 protocol smtp
 auth on
+host echo.mxrouting.net
+tls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+#tls_nocertcheck
+logfile ~/.msmtp.log
+
+account personal
 from sng@luxagraf.net
 user sng@luxagraf.net
 passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/sng_mxroute.gpg"
 
-tls on
-#tls_trust_file ~/.mutt/DigiCertHighAssuranceEVRootCA.crt
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-logfile ~/.msmtp.log
-account default : sng@luxagraf.net
+account work
+from wired@scottgilbertson.net
+user wired@scottgilbertson.net
+passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/wired@scottgilbertson.net.gpg"
+
+account default : personal
 
-tls on
-tls_nocertcheck
-logfile ~/.msmtp.log
diff --git a/.mutt/muttrc b/.mutt/muttrc
index b15f05f..8c82e4a 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -30,10 +30,6 @@ set meta_key=yes         # since control-j/k don't work use meta
 #set sidebar_width   = 30
 #color sidebar_new color221 color233
 
-# Need trash patch for this to work -------------------
-
-set trash = "+mxroute/Trash"
-
 # Status Bar -----------------------------------------
 set status_chars  = " *%A"
 set status_format = "───[ Folder: %f ]───[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───"
@@ -46,46 +42,7 @@ unhdr_order *                           # some distros order things by default
 hdr_order from: to: cc: date: subject:  # and in this order
 
 
-# Account Settings -----------------------------------
-
-# Default inbox.
-set spoolfile = "+mxroute/INBOX"
-
-# Alternate email addresses.
-alternates "luxagraf@gmail.com|scott_gilbertson@condenast.com"
-
-# Mailboxes to show
-set folder = ~/mail/mxroute
-mailboxes =INBOX \
-          +Archive \
-          +Trash \
-          +Bookmarks \
-          +Darktable \
-          +Sent \
-          +'Old Mail.2008' \
-          +'Old Mail.2009' \
-          +'Old Mail.2010' \
-          +'Old Mail.2011' \
-          +'Old Mail.2012' \
-          +'Old Mail.2013' \
-          +'Old Mail.2014' \
-          +'Old Mail.2015' \
-          +'Old Mail.2016' \
-          +'Old Mail.2017' \
-          +'Old Mail.2018' \
-          +'Old Mail.2019' \
-          +Drafts \
-          +temporary/search \
-# Other special folders.
-set mbox      = "+mxroute/Archive"
-set postponed = "+Drafts"
-
-
-alias sng Scott Gilbertson <sng@luxagraf.net>
-alias wired Scott Gilbertson <scott_gilbertson@wired.com>
- 
-macro compose v "<edit-from>^Uidentity_<tab>" "Select from" 
- # Index View Options ---------------------------------
+# Index View Options ---------------------------------
 set date_format = "%m/%d"
 set index_format = "[%Z]  %D  %-20.20F  %s"
 set sort = threads                         # like gmail
@@ -118,7 +75,7 @@ macro index,pager a "<save-message>=Archive<enter><sync-mailbox>" "Archive"
 macro index,pager s "<save-message>=starred<enter><sync-mailbox>" "Starred"
 macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox"
 macro index,pager ga "<change-folder>=Archive<enter>" "Go to all mail"
-macro index,pager gb "<change-folder>=bookmarks<enter>" "Go to Bookmarks"
+macro index,pager gb "<change-folder>=Bookmarks<enter>" "Go to Bookmarks"
 #macro index,pager gs "<change-folder>=starred<enter>" "Go to starred messages"
 macro index,pager gs "<change-folder>=Sent<enter>" "Go to starred messages"
 #Save a message to my notes folder
@@ -175,21 +132,8 @@ set reverse_name                     # reply as whomever it was to
 set include                          # include message in replies
 set forward_quote                    # include message in forwards
 
-set editor = "nvim"        # Use terminal Vim to compose email.
 
-set from     = "sng@luxagraf.net"
-set sendmail = "/usr/bin/msmtp"
-set sendmail_wait = 0
 #set record = "/home/lxf/mail/fastmail/sent"
-set record = "=Sent"  
-#macro generic "<esc>1" ":set from=scott_gilbertson@wired.com"
-#macro generic "<esc>2" ":set from=you@your-employer.example"
-#macro generic "<esc>3" ":set from=you@some-other-provider.example"
-
-#after the fact identity switching is less prone to me being an idiot, switching to a different account and then forgetting I did that.
-alias identity_sng Scott Gilbertson <sng@luxagraf.net>
-alias identity_wired Scott Gilbertson <scott_gilbertson@wired.com>
-macro compose v "<edit-from>^Uidentity_<tab>" "Select from" 
 
 #source ~/.mutt/alias
 
@@ -200,13 +144,8 @@ bind index p recall-message
 set query_command = "abook --mutt-query '%s'"
 bind editor <Tab> complete-query
 bind editor ^T    complete
-#source ~/.mutt/mutt-colors-solarized-dark-256.muttrc
+set editor="nvim -c 'set spell spelllang=en'" 
 source ~/.mutt/mutt-colors-solarized-dark-16.muttrc
-#source ~/.mutt/mutt-zenburn.muttrc
-
-#make N do something useful/like Vim
-#bind index N search-opposite
-#bind pager N search-opposite
 
 #undo limit searches
 macro index c "<limit>all\n" "show all messages (undo limit)"
@@ -217,3 +156,9 @@ macro index <F9> "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt
 
 #macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
 macro index,pager A "<pipe-message>abook --add-email<return>" "add the sender address to abook"
+
+set spoolfile = "+personal/INBOX"
+source ~/.mutt/personal
+
+folder-hook personal/* source ~/.mutt/personal
+folder-hook wired/*     source ~/.mutt/work
diff --git a/.mutt/personal b/.mutt/personal
new file mode 100644
index 0000000..e4034e1
--- /dev/null
+++ b/.mutt/personal
@@ -0,0 +1,32 @@
+set from = "sng@luxagraf.net"
+set folder = ~/mail/personal
+set sendmail = "/usr/bin/msmtp -a personal"
+set sendmail_wait = 0
+set trash = "+Trash"
+set mbox = "+Archive"
+set postponed = "+Drafts"
+set record="+Sent"
+# Alternate email addresses.
+alternates "luxagraf@gmail.com"
+
+# Mailboxes to show
+mailboxes =INBOX \
+          +Archive \
+          +Trash \
+          +Bookmarks \
+          +Darktable \
+          +Sent \
+          +'Old Mail.2008' \
+          +'Old Mail.2009' \
+          +'Old Mail.2010' \
+          +'Old Mail.2011' \
+          +'Old Mail.2012' \
+          +'Old Mail.2013' \
+          +'Old Mail.2014' \
+          +'Old Mail.2015' \
+          +'Old Mail.2016' \
+          +'Old Mail.2017' \
+          +'Old Mail.2018' \
+          +'Old Mail.2019' \
+          +Drafts \
+          +temporary/search
diff --git a/.mutt/work b/.mutt/work
new file mode 100644
index 0000000..e0578cd
--- /dev/null
+++ b/.mutt/work
@@ -0,0 +1,19 @@
+set from = "wired@scottgilbertson.net"
+set folder = ~/mail/wired
+set sendmail = "/usr/bin/msmtp -a work"
+set trash = "+Trash"
+set mbox = "+Archive"
+set postponed = "+Drafts"
+set record="+Sent"
+# Alternate email addresses.
+alternates "scott_gilbertson@wired.com"
+
+# Mailboxes to show
+mailboxes =INBOX \
+          +Archive \
+          +Trash \
+          +Sent \
+          +Drafts \
+          +temporary/search \
+
+
diff --git a/.offlineimaprc b/.offlineimaprc
index 63171d7..6c6354a 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,15 +1,15 @@
 [general]
 ui = ttyui
-accounts = MxRoute
+accounts = Personal, Wired 
 pythonfile=~/.mutt/offlineimap.py
 fsync = False
 
-[Account MxRoute]
-localrepository = MxRouteLocal
-remoterepository = MxRouteRemote
+[Account Personal]
+localrepository = Personal-Local
+remoterepository = Personal-Remote
 postsynchook = notmuch new
 
-[Repository MxRouteRemote]
+[Repository Personal-Remote]
 maxconnections = 1
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
 ssl_versions = tls1_2
@@ -19,8 +19,30 @@ remoteport = 993
 remoteuser = sng@luxagraf.net
 ssl = yes
 remotepasseval = get_password("sng_mxroute")
-folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Old Mail']
+folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Old Mail', 'Old Mail.2015']
 
-[Repository MxRouteLocal]
+[Repository Personal-Local]
 type = Maildir
-localfolders = ~/mail/mxroute
+localfolders = ~/mail/personal
+
+[Account Wired]
+localrepository = Wired-Local
+remoterepository = Wired-Remote
+postsynchook = notmuch new
+
+[Repository Wired-Remote]
+maxconnections = 1
+sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+ssl_versions = tls1_2
+type = IMAP
+remotehost = echo.mxrouting.net
+remoteport = 993
+remoteuser = wired@scottgilbertson.net
+ssl = yes
+remotepasseval = get_password("wired@scottgilbertson.net")
+folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Archive', 'Drafts']
+
+[Repository Wired-Local]
+type = Maildir
+localfolders = ~/mail/wired
+