From 138368a6187c5a04c8af658ee504e7435ec6cf4e Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Wed, 28 Jul 2021 23:54:31 -0400
Subject: Major mail changes

---
 .config/neomutt/mailcap   |  1 +
 .config/neomutt/neomuttrc | 29 +++++++++++++++++++++--------
 .local/bin/update-mail    |  3 +++
 .tmux.conf                |  3 +++
 .zshrc                    |  4 ++--
 5 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 .config/neomutt/mailcap
 create mode 100755 .local/bin/update-mail
 create mode 100644 .tmux.conf

diff --git a/.config/neomutt/mailcap b/.config/neomutt/mailcap
new file mode 100644
index 0000000..b5b5c19
--- /dev/null
+++ b/.config/neomutt/mailcap
@@ -0,0 +1 @@
+text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc
index 960fb0c..3bc693e 100644
--- a/.config/neomutt/neomuttrc
+++ b/.config/neomutt/neomuttrc
@@ -26,23 +26,35 @@
 source ~/.config/neomutt/passwords.mutt
 source ~/.config/neomutt/nord.mutt
 
+timeout-hook "echo `~/.local/bin/update-mail`"
+startup-hook "echo `~/.local/bin/update-mail -L`"
+shutdown-hook "echo `~/.local/bin/update-mail`"
+
 set smtp_authenticators="plain"
 
 set from="Cameron Katri <me@cameronkatri.com>"
 set edit_headers=yes
 
-set spoolfile=+INBOX
-set record="=Sent"
-set postponed="=Drafts"
+set mbox_type="Maildir"
+set spoolfile="+INBOX"
+set record="+Sent"
+set postponed="+Drafts"
+set trash="+Trash"
+
+mailboxes $spoolfile $record $postponed $trash
+mailboxes +Junk +Starred
 
-set imap_check_subscribed
-#set sort=reverse-date-sent
 set sort=threads
 
-bind index G imap-fetch-mail
+macro index G "<shell-escape>mbsync -a<enter>" "sync email"
+
+set header_cache = "~/.cache/neomutt/headers"
+set message_cachedir = "~/.cache/neomutt/bodies"
 
 set sidebar_visible
-set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
+set sidebar_format = "%B%* [%N]%*"
+set sidebar_new_mail_only = no
+set sidebar_non_empty_mailbox_only = yes
 set mail_check_stats
 bind index,pager \CP sidebar-prev
 bind index,pager \CN sidebar-next
@@ -52,6 +64,7 @@ set crypt_autosign
 set crypt_use_gpgme
 set pgp_default_key="7D3B36CEA40FCC2181FB6DCDBAFFD97826540F1C"
 
-set trash="+Trash"
+auto_view text/html
+set mailcap_path = "~/.config/neomutt/mailcap"
 
 # vim: syntax=neomuttrc
diff --git a/.local/bin/update-mail b/.local/bin/update-mail
new file mode 100755
index 0000000..df56fdd
--- /dev/null
+++ b/.local/bin/update-mail
@@ -0,0 +1,3 @@
+#!/bin/sh
+tmux new-session -d mbsync -aq $@
+exit 0
diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..1711f7a
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,3 @@
+set -g default-terminal tmux-256color
+set -g mouse on
+run-shell "~/.tmux/themes/nord-tmux/nord.tmux"
diff --git a/.zshrc b/.zshrc
index 36c63ce..faa5cd6 100755
--- a/.zshrc
+++ b/.zshrc
@@ -43,7 +43,7 @@ alias icat="kitty +kitten icat"
 alias fuzz="fzf --preview 'bat --style=numbers,changes --color=always --line-range :500 {}' --preview-window=right:66%"
 alias sort='LC_ALL=C sort'
 # https://reviews.freebsd.org/D30545
-alias diff='LC_ALL=C TZ=UTC diff --color=auto'
+alias diff='LC_ALL=C TZ=UTC diff'
 alias ls='ls --color=auto -F'
 alias diffstat='diffstat -C'
 export BAT_THEME="Nord"
@@ -68,7 +68,7 @@ setxkbmap -option compose:rctrl
 export GPG_TTY=$(tty)
 
 # Completion for kitty
-kitty + complete setup zsh | source /dev/stdin
+#kitty + complete setup zsh | source /dev/stdin
 
 export LESS='-FiMRx2$z-4$Dd+c$Du+g'
 
-- 
cgit v1.2.3-56-ge451