dotfiles

diff --git a/mutt/mailcap b/mutt/mailcap
index b8ec8d19591cd30df63d27085dd839b06ef75287..c41dbd820184eaa3e61f8f5e3258d27a184e7ed4 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -33,6 +33,7 @@ application/pdf; ~/dotfiles/mutt/view_attachment.sh %s pdf
 
 # HTML
 text/html; ~/dotfiles/mutt/view_attachment.sh %s html
+# text/html; w3m -I %{charset} -T text/html; copiousoutput;
 
 # Unidentified.
 application/octet-stream; ~/dotfiles/mutt/view_attachment.sh %s "-" 




diff --git a/mutt/sidebar.muttrc b/mutt/sidebar.muttrc
index a70b18e2e0d5cb7219a080b913f9668ddab65954..8abf91ad82ef966b3deec6dcbc0057cf91d1efd8 100644
--- a/mutt/sidebar.muttrc
+++ b/mutt/sidebar.muttrc
@@ -4,7 +4,7 @@ ###
 
 # settings
 # colors
-color sidebar_new color221 color233
+# color sidebar_new color221 color233
 
 # bindings
 bind index,pager <down>   sidebar-next




diff --git a/mutt/view_attachment.sh b/mutt/view_attachment.sh
index 969883267c0e10153c2dbf6c94d81b53373f7bca..61c14bc27000eeea3015896011332bdd754a6edf 100755
--- a/mutt/view_attachment.sh
+++ b/mutt/view_attachment.sh
@@ -119,12 +119,11 @@
 # If there's no 'open with' then we can let preview do it's thing.
 # Otherwise we've been told what to use.  So do an open -a.
 
-echo "near the end"
 echo $open_with
 echo $newfile
 
 if [ $type = "img" ]; then
-    eog $newfile
+    feh $newfile
     exit 0;
 fi
 
@@ -134,7 +133,7 @@     exit 0;
 fi
 
 if [ $type = "pdf" ]; then
-    evince $newfile
+    zathura $newfile
     exit 0;
 fi
 
@@ -146,9 +145,7 @@ fi
 
 
 if [ -z $open_with ]; then
-    echo "simple"
     xdg-open $newfile
 else
-    echo "with -a"
     xdg-open -a "$open_with" $newfile
 fi




diff --git a/muttrc b/muttrc
index 116dc637a81844cb82a7e5cb4179bc9a95ea56ad..a6f653c145e54bd85795c7f459e4d3fae3e47879 100644
--- a/muttrc
+++ b/muttrc
@@ -2,13 +2,11 @@ # Muttrc
 # ------
 #
 # Most of this has been "stolen" from Steve Losh
+# https://hg.stevelosh.com/dotfiles/file/tip/mutt
 
 # Paths
 
 set alias_file       = ~/.mutt/alias         # alias file
-# set header_cache     = ~/.mutt/cache/headers # where to store headers
-# set message_cachedir = ~/.mutt/cache/bodies  # where to store bodies
-# set certificate_file = ~/.mutt/certificates  # where to store certs
 set mailcap_path     = ~/.mutt/mailcap       # entries for filetypes
 set signature        = ~/.mutt/sig           # my signature file
 set tmpdir           = ~/.mutt/temp          # where to keep temp files
@@ -27,12 +25,11 @@
 # Basic Options
 
 source ~/dotfiles/mutt/mutt-colors-solarized-dark-16.muttrc
-# source ~/.mutt/tomorrow.muttrc
 source ~/dotfiles/mutt/sidebar.muttrc                        # sidebar
 
 set wait_key = no        # shut up, mutt
 set mbox_type = Maildir  # mailbox type
-set folder = ~/.mail    # mailbox location
+set folder = ~/.mail     # mailbox location
 set timeout = 3          # idle time before scanning
 set mail_check = 0       # minimum time between scans
 unset move               # gmail does that
@@ -111,7 +108,8 @@ # Mailboxes to show in the sidebar.
 mailboxes +aliases/redhat \
           +aliases/honza \
           +aliases/gmail \
-          +aliases/pokorny
+          +aliases/pokorny \
+          +aliases/kids
 
 # Other special folders.
 set mbox      = "honza/archive"
@@ -130,7 +128,6 @@ folder-hook +aliases/redhat source ~/dotfiles/mutt/redhat.muttrc
 folder-hook +aliases/honza source ~/dotfiles/mutt/honza.muttrc
 folder-hook +aliases/pokorny source ~/dotfiles/mutt/pokorny.muttrc
 folder-hook +aliases/gmail source ~/dotfiles/mutt/gmail.muttrc
-folder-hook +mbsync/redhat/inbox source ~/dotfiles/mutt/redhat.muttrc
 
 # Key Bindings
 
@@ -175,6 +172,8 @@ macro index o "mbsync inboxes"
 macro index O "<shell-escape>mbsync all-mail<enter>"
 
 # Just use notmuch for everything
+#
+# https://github.com/honza/mutt-notmuch-py
 macro index / "<enter-command>unset wait_key<enter><shell-escape>~/code/mutt-notmuch-py/mutt-notmuch-py -G<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
           "search mail (using notmuch)"
 
@@ -187,14 +186,6 @@
 # View
 bind attach <return> view-mailcap
 
-# Attach an epub version of the email
-macro compose E "<enter-command>unset wait_key<enter><shell-escape>~/bin/epubify<enter>"
-
-
 # "Open in Vim"
 
 macro index,pager V "|vim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -<enter>"              "open in vim"
-
-# Wrap plan-text email bodies to 79 characters using the `wrap` command in
-# ~/bin
-# set display_filter = "wrap"