switched to mxroute for email

3 files changed, 16 insertions, 61 deletions

diff --git a/.msmtprc b/.msmtprc
index 275642a..53b3531 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -1,11 +1,11 @@
 account sng@luxagraf.net
-host smtp.migadu.com
+host echo.mxrouting.net
 port 587
 protocol smtp
 auth on
 from sng@luxagraf.net
 user sng@luxagraf.net
-passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/sng@luxagraf.net.gpg"
+passwordeval "gpg2 --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/sng_mxroute.gpg"
 
 tls on
 #tls_trust_file ~/.mutt/DigiCertHighAssuranceEVRootCA.crt
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 9377e3a..3366b40 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -32,7 +32,7 @@ set meta_key=yes         # since control-j/k don't work use meta
 
 # Need trash patch for this to work -------------------
 
-set trash = "+migadu/Trash"
+set trash = "+mxroute/Trash"
 
 # Status Bar -----------------------------------------
 set status_chars  = " *%A"
@@ -49,19 +49,18 @@ hdr_order from: to: cc: date: subject:  # and in this order
 # Account Settings -----------------------------------
 
 # Default inbox.
-set spoolfile = "+migadu/INBOX"
+set spoolfile = "+mxroute/INBOX"
 
 # Alternate email addresses.
 alternates "luxagraf@gmail.com|scott_gilbertson@condenast.com"
 
 # Mailboxes to show
-set folder = ~/mail/migadu
+set folder = ~/mail/mxroute
 mailboxes =INBOX \
           +Archive \
           +Trash \
           +Bookmarks \
           +Sent \
-          +Junk \
           +'Old Mail.2008' \
           +'Old Mail.2009' \
           +'Old Mail.2010' \
@@ -77,7 +76,7 @@ mailboxes =INBOX \
           +Drafts \
           +temporary/search \
 # Other special folders.
-set mbox      = "+migadu/Archive"
+set mbox      = "+mxroute/Archive"
 set postponed = "+Drafts"
 
 
diff --git a/.offlineimaprc b/.offlineimaprc
index c4eae21..63171d7 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,70 +1,26 @@
 [general]
 ui = ttyui
-accounts = Migadu
+accounts = MxRoute
 pythonfile=~/.mutt/offlineimap.py
 fsync = False
 
-[Account Migadu]
-localrepository = MigaduLocal
-remoterepository = MigaduRemote
+[Account MxRoute]
+localrepository = MxRouteLocal
+remoterepository = MxRouteRemote
 postsynchook = notmuch new
 
-[Account Fastmail]
-localrepository = FMLocal
-remoterepository = FMRemote
-postsynchook = notmuch new
-
-[Repository FMLocal]
-type = Maildir
-localfolders = ~/mail/fastmail
-nametrans = lambda folder: {'drafts':  'INBOX.Drafts',
-                            'trash':   'INBOX.Trash',
-                            'sent':   'INBOX.Sent Items',
-                            'starred': 'INBOX.Starred',
-                            'archive': 'INBOX.Archive',
-                            'darktable': 'INBOX.Darktable',
-                            'recipes': 'INBOX.Recipes',
-                            'bookmarks': 'INBOX.Bookmarks',
-                            'quickbridge': 'INBOX.quickbridge',
-                            }.get(folder, folder)
-
-
-[Repository FMRemote]
-maxconnections = 1
-sslcacertfile = /etc/ssl/certs/ca-certificates.crt
-ssl_versions = tls1_2
-type = IMAP
-remotehost = mail.messagingengine.com
-remoteport = 993
-remoteuser = luxagraf@fastmail.fm
-ssl = yes
-remotepasseval = get_password("fastmail.com")
-
-#realdelete = no
-nametrans = lambda folder: {'INBOX.Drafts': 'drafts',
-                            'INBOX.Sent Items': 'sent',
-                            'INBOX.Bookmarks': 'bookmarks',
-                            'INBOX.Archive': 'archive',
-                            'INBOX.Starred': 'starred',
-                            'INBOX.Darktable': 'darktable',
-                            'INBOX.Recipes': 'recipes',
-                            'INBOX.Trash': 'trash',
-                            }.get(folder, folder)
-folderfilter = lambda folder: folder in ['INBOX.Drafts', 'INBOX.Starred', 'INBOX.Sent Items', 'INBOX.barcode', 'INBOX', 'INBOX.Trash', 'INBOX.Bookmarks', 'INBOX.Archive']
-
-
-[Repository MigaduRemote]
+[Repository MxRouteRemote]
 maxconnections = 1
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
 ssl_versions = tls1_2
 type = IMAP
-remotehost = imap.migadu.com
+remotehost = echo.mxrouting.net
 remoteport = 993
 remoteuser = sng@luxagraf.net
 ssl = yes
-remotepasseval = get_password("sng@luxagraf.net")
-folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Junk']
+remotepasseval = get_password("sng_mxroute")
+folderfilter = lambda folder: folder in ['INBOX', 'Sent', 'Trash', 'Bookmarks', 'Archive', 'Drafts', 'Darktable', 'Old Mail']
 
-[Repository MigaduLocal]
+[Repository MxRouteLocal]
 type = Maildir
-localfolders = ~/mail/migadu
+localfolders = ~/mail/mxroute