mutt: no imapfilter

1 files changed, 26 insertions, 22 deletions

diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 6fa2b86..c42d144 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -4,7 +4,7 @@ set alias_file                = ~/.mutt/alias
 set header_cache              = ~/.mutt/cache/headers
 set mailcap_path              = ~/.mutt/mailcap
 set signature                 = ~/.mutt/sig
-set tmpdir                    = /tmp/pks/mutt
+set tmpdir                    = ~/.cache
 set use_from                  = yes
 set use_envelope_from         = yes
 set sort                      = threads
@@ -27,9 +27,9 @@ set include                   = yes
 # formats
 set date_format  = "!%b %d %Y"
 set index_format = " %Z  %D  %-16.16L  %s"
+set attribution  = "On %{%Y-%m-%d}, at %{%H:%M:%S %Z}, %a wrote:"
 folder-hook .*/Inbox 'set date_format="!%b %d"'
 folder-hook .*/Archive 'set date_format="!%Y-%m-%d"'
-set attribution = "On %{%Y-%m-%d}, at %{%H:%M:%S %Z}, %a wrote:"
 
 # auto view
 auto_view text/html
@@ -39,13 +39,13 @@ bind index F "flag-message"
 
 # macros
 set wait_key = no
-macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/primary.lua &>/dev/null && mbsync primary && notmuch new 2>/dev/null<enter>"
-#macro index,pager H "<shell-escape>imapfilter -c ~/.imapfilter/secondary.lua &>/dev/null     && mbsync secondary     && notmuch new 2>/dev/null<enter>"
-macro index,pager J "<shell-escape>mbsync -a && notmuch new 2>/dev/null<enter>"
-macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
-macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro index M "T.*\n;WN" "Mark all messages as read"
+macro index,pager G "<shell-escape>mbsync primary && notmuch new 2>/dev/null<enter>"
+#macro index,pager H "<shell-escape>mbsync secondary && notmuch new 2>/dev/null<enter>"
+macro index,pager J      "<shell-escape>mbsync -a && notmuch new 2>/dev/null<enter>"
+macro index       <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
+macro index       c      "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro pager       c      "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index       M      "T.*\n;WN" "Mark all messages as read"
 
 # abook
 set query_command = "abook --mutt-query '%s'"
@@ -70,32 +70,36 @@ folder-hook primary/* source ~/.mutt/primary.rc
 #folder-hook secondary/* source ~/.mutt/secondary.rc
 
 # notmuch
-set my_notmuchfs_folder="/tmp/pks/notmuchfs"
-macro index "," "<shell-escape>prompt_mkdir $my_notmuchfs_folder<enter><change-folder>~/.mail/current_search<enter>" "Search"
+macro index "," \
+  "<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+  <shell-escape>notmuch-mutt -r --prompt search<enter>\
+  <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
+  <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+  "notmuch: "
 
 # status bar
-set status_chars  = " *%A"
+set status_chars = " *%A"
 
 # html
 auto_view text/html
 alternative_order text/plain text/enriched text/html
-bind attach <return>    view-mailcap
+bind attach <return> view-mailcap
 
 # sidebar
-bind index,pager <down>   sidebar-next
-bind index,pager <up>     sidebar-prev
-bind index,pager <right>  sidebar-open
-set sidebar_visible = yes
-set sidebar_width   = 16
-set sidebar_format  = '%B%> %!%?N? %N? '
-set sidebar_short_path = yes
+bind index,pager <down>  sidebar-next
+bind index,pager <up>    sidebar-prev
+bind index,pager <right> sidebar-open
+set sidebar_visible       = yes
+set sidebar_width         = 16
+set sidebar_format        = '%B%> %!%?N? %N? '
+set sidebar_short_path    = yes
 set sidebar_folder_indent = yes
-set sidebar_indent_string =  ' '
+set sidebar_indent_string = ' '
 set sidebar_new_mail_only = no
 
 # pager
 set pager_index_lines = 20
-set pager_context = 3
+set pager_context     = 3
 set pager_stop
 set menu_scroll
 set tilde