decent offlineimap and mutt settings

4 files changed, 83 insertions, 64 deletions

diff --git a/msmtprc b/msmtprc
index cd42308..3a5c3ab 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,5 +1,6 @@
 account matthewlemon
-host mail.messagingengine.com
+#host mail.messagingengine.com
+host smtp.fastmail.com
 from matt@matthewlemon.com
 tls on
 tls_certcheck off
@@ -9,20 +10,20 @@ port 465
 auth on
 user matthewlemon@fastmail.fm
 #passwordeval python2 -c "import keyring; print keyring.get_password('fastmail', 'matthewlemon')"
-#passwordeval pass Email/fastmail
+passwordeval pass AppPasswords/fastmail-offlineimap
 #passwordeval gpg --no-tty -q -d /home/lemon/.password-store/Email/fastmail.gpg
-passwordeval gpg -d /home/lemon/.password-store/Email/fastmail.gpg
+#passwordeval gpg -d /home/lemon/.password-store/Email/fastmail.gpg
 logfile ~/.msmtp.log
 
-account gmail
-from matthew.lemon@gmail.com
-user matthew.lemon@gmail.com
-host smtp.gmail.com
-port 587
-protocol smtp
-auth on
-tls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-passwordeval pass Email/gmail-application
+#account gmail
+#from matthew.lemon@gmail.com
+#user matthew.lemon@gmail.com
+#host smtp.gmail.com
+#port 587
+#protocol smtp
+#auth on
+#tls on
+#tls_trust_file /etc/ssl/certs/ca-certificates.crt
+#passwordeval pass Email/gmail-application
 
 account default : matthewlemon
diff --git a/muttrc b/muttrc
index 1d63046..65fa3a0 100644
--- a/muttrc
+++ b/muttrc
@@ -37,7 +37,10 @@ set text_flowed=yes
 
 # Sidebar Patch --------------------------------------
 #set sidebar_delim = '│'
-#set sidebar_visible = yes
+set sidebar_visible = yes
+set sidebar_width = 20
+set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
+set mail_check_stats
 #set sidebar_width = 24
 ## not working in xubuntu set sidebar_shortpath = yes
 #set sidebar_sort = yes
@@ -58,19 +61,29 @@ hdr_order from: to: cc: bcc: date: subject:  # and in this order
 
 # Default inbox.
 set spoolfile = "+matt-matthewlemon.com/INBOX"
+#set spoolfile = "+INBOX"
 
 # Alternate email addresses.
 #alternates <shit goes in here>
 
 # Mailboxes to show in the sidebar.
 
- 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.Gmail.Archive \
-           +matt-matthewlemon.com/INBOX.Trash \
-#           +temporary/search \
+subscribe announce@openbsd.org
+
+named-mailboxes Inbox +matt-matthewlemon.com/INBOX \
+	  Sent\ Items +matt-matthewlemon.com/Sent\ Items \
+	  Archive +matt-matthewlemon.com/Archive \
+	  Archive\ 2019 +matt-matthewlemon.com/Archive.2019 \
+          Drafts +matt-matthewlemon.com/Drafts \
+	  Gmail\ Old +matt-matthewlemon.com/Gmail\ Old\ Archive \
+          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 \
+#mailboxes +INBOX +INBOX.Archive +INBOX.Sent\ Items +INBOX.Drafts +INBOX.Trash
 
 # Other special folders.
 set mbox      = "+matt-matthewlemon.com/INBOX.Archive"
@@ -86,7 +99,7 @@ set sort_re                                # thread based on regex
 set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
 
 # Index Key Bindings ---------------------------------
-#bind index gg       first-entry
+bind index 0        first-entry
 bind index G        last-entry
 
 bind index R        group-reply
@@ -128,7 +141,7 @@ alternative_order text/plain text/enriched text/html
 # Pager Key Bindings ---------------------------------
 bind pager k  previous-line
 bind pager j  next-line
-bind pager gg top
+#bind pager gg top
 bind pager G  bottom
 
 bind pager R  group-reply
@@ -157,12 +170,12 @@ set include                          # include message in replies
 set forward_quote                    # include message in forwards
 
 #set editor = "vim"        # Use terminal Vim to compose email.
-set editor = "nvim %s"
+set editor = "vim %s"
 
 set from     = "matt@matthewlemon.com"
-set sendmail = "/usr/bin/msmtp -a matthewlemon"
+set sendmail = "/usr/local/bin/msmtp -a matthewlemon"
 set sendmail_wait = 0
-set record = "+matt-matthewlemon.com/INBOX.Sent\ Items"
+set record = "+matt-matthewlemon.com/Sent\ Items"
 
 bind compose p postpone-message
 bind index p recall-message
@@ -233,3 +246,5 @@ source ~/.mutt/colours                  # Define colours.
 #
 # MAILCAP
 auto_view text/html
+
+# vim: ft=muttrc
diff --git a/offlineimap.py b/offlineimap.py
index 9a64c0c..264404a 100644
--- a/offlineimap.py
+++ b/offlineimap.py
@@ -4,4 +4,4 @@
 from subprocess import check_output
 
 def get_pass(account):
-    return check_output("pass Email/" + account, shell=True).splitlines()[0]
+    return check_output("pass AppPasswords/" + account, shell=True).splitlines()[0]
diff --git a/offlineimaprc b/offlineimaprc
index dd4181c..931ea82 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,6 +1,7 @@
 [general]
 ui = TTY.TTYUI
-accounts = MatthewLemon, Gmail
+#accounts = MatthewLemon, Gmail
+accounts = MatthewLemon
 pythonfile=~/.offlineimap.py
 fsync = False
 
@@ -8,54 +9,56 @@ fsync = False
 localrepository = MatthewLemon-Local
 remoterepository = MatthewLemon-Remote
 #status_backend = sqlite
-postsynchook = notmuch new
+#postsynchook = notmuch new
 
 [Repository MatthewLemon-Local]
 type = Maildir
 localfolders = ~/.mail/matt-matthewlemon.com
 # nametrans = lambda folder: {'drafts': '/Drafts',
-# 				'sent':	'/Sent',
-# 				'archive': '/Archive',
-# 				'inbox': '/Inbox',
-# 				}.get(folder, folder)
+#  				'sent':	'/Sent',
+#  				'archive': '/Archive',
+#  				'inbox': '/Inbox',
+#  				}.get(folder, folder)
 
 [Repository MatthewLemon-Remote]
 #cert_fingerprint = 54137524fe721f0cbb8a6a0e1e280ade50482e29
 maxconnections = 3
 type = IMAP
-remotehost = mail.messagingengine.com
+#remotehost = mail.messagingengine.com
+remotehost = imap.fastmail.com
 ssl = yes
-sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+#sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+sslcacertfile = /etc/ssl/cert.pem
 remoteuser = matthewlemon@fastmail.fm
-remotepasseval = get_pass("fastmail")
+remotepasseval = get_pass("fastmail-offlineimap")
 #remotepasseval = keyring.get_password('offlineimap', 'matthewlemon') 
-# nametrans = lamda folder: {'/Drafts': 'drafts',
-# 				'/Sent': 'sent',
-# 				'/Archive': 'archive',
-# 				'/Inbox': 'inbox',
-# 				}.get(folder, folder)
-#folderfilter = lambda folder: folder in ['INBOX', 'INBOX.Sent', 'INBOX.Archive', 'INBOX.Drafts']
-folderfilter = lambda folder: folder in ['INBOX', 'INBOX.Sent Items', 'INBOX.Archive', 'INBOX.Drafts']
+#nametrans = lamda folder: {'/Drafts': 'drafts',
+#				'/Sent': 'sent',
+#				'/Archive': 'archive',
+#				'/Inbox': 'inbox',
+#				}.get(folder, folder)
+folderfilter = lambda folder: folder in ['INBOX', 'Archive', 'Sent Items', 'Drafts']
+#folderfilter = lambda folder: folder in ['INBOX', 'INBOX.Sent Items', 'INBOX.Archive', 'INBOX.Drafts']
 
-[Account Gmail]
-localrepository = Gmail-Local
-remoterepository = Gmail-Remote
-synclabels = yes
-
-[Repository Gmail-Local]
-type = GmailMaildir
-localfolders = ~/.mail/matthew.lemon-gmail.com
-
-[Repository Gmail-Remote]
-type = Gmail
-remoteuser = matthew.lemon@gmail.com
-remotepass = hvhmfbdlgggebxgc
-nametrans = lambda folder: {'drafts': '/Drafts',
-				'sent':	'/Sent',
-				'archive': '/Archive',
-				'inbox': '/Inbox',
-				}.get(folder, folder)
-folderfilter = lambda foldername: foldername not in ['Gmail]/All Mail']
-sslcacertfile = /etc/ssl/certs/ca-certificates.crt
-ssl_version = tls1_2
+#[Account Gmail]
+#localrepository = Gmail-Local
+#remoterepository = Gmail-Remote
+#synclabels = yes
+#
+#[Repository Gmail-Local]
+#type = GmailMaildir
+#localfolders = ~/.mail/matthew.lemon-gmail.com
+#
+#[Repository Gmail-Remote]
+#type = Gmail
+#remoteuser = matthew.lemon@gmail.com
+#remotepass = hvhmfbdlgggebxgc
+#nametrans = lambda folder: {'drafts': '/Drafts',
+#				'sent':	'/Sent',
+#				'archive': '/Archive',
+#				'inbox': '/Inbox',
+#				}.get(folder, folder)
+#folderfilter = lambda foldername: foldername not in ['Gmail]/All Mail']
+#sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+#ssl_version = tls1_2