8 files changed, 16 insertions, 16 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 3eb9316..65b2b2a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -39,7 +39,7 @@
  '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95"))
  '(objed-cursor-color "#ff5370")
  '(package-selected-packages
-   '(helm-fuzzy-find helm-fuzzier fuzzy fuzzy-finder neotree color-theme doom-modeline-now-playing treemacs-icons-dired edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
+   '(evil-mu4e helm-fuzzy-find helm-fuzzier fuzzy fuzzy-finder neotree color-theme doom-modeline-now-playing treemacs-icons-dired edit-indirect yaml-mode lua-mode company-nginx company-fuzzy company-go company-shell helm-ag rainbow-identifiers nginx-mode evil-quickscope vc-fossil crontab-mode go-mode mutt-mode pacmacs gemini-mode org-evil glsl-mode vimrc-mode windresize evil evil-collection evil-leader evil-search-highlight-persist evil-mc evil-surround evil-ediff evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers yasnippet yasnippet-classic-snippets yasnippet-snippets auto-yasnippet el-autoyas helm helm-xref helm-etags-plus helm-fuzzy helm-themes helm-make helm-projectile projectile company company-box which-key magit undo-tree shell-pop autopair paredit rainbow-delimiters color-identifiers-mode ibuffer-vc ibuffer-projectile eyebrowse diff-hl fzf font-utils restart-emacs string-utils dired-icon kaolin-themes doom-themes spacemacs-theme dashboard org-superstar toc-org pdf-tools dockerfile-mode web-mode ssh sudo-ext vimish-fold bind-key all-the-icons all-the-icons-dired all-the-icons-ibuffer))
  '(pos-tip-background-color "#2E2A29")
  '(pos-tip-foreground-color "#d4d4d6")
  '(rustic-ansi-faces
diff --git a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
index 3e822aa..897dfeb 100644
--- a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
+++ b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
@@ -5,8 +5,8 @@ set from = "bousset.rudy@gmail.com"
 set sendmail = "msmtp -a bousset.rudy@gmail.com"
 alias me Rudy Bousset <bousset.rudy@gmail.com>
 set folder = "$MAIL/bousset.rudy@gmail.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/bousset.rudy@gmail.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/bousset.rudy@gmail.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/bousset.rudy@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/bousset.rudy@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
index ad385e2..74f5e78 100644
--- a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
+++ b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
@@ -5,8 +5,8 @@ set from = "olsen.oyvind.nor@gmail.com"
 set sendmail = "msmtp -a olsen.oyvind.nor@gmail.com"
 alias me Joe <olsen.oyvind.nor@gmail.com>
 set folder = "$MAIL/olsen.oyvind.nor@gmail.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/olsen.oyvind.nor@gmail.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/olsen.oyvind.nor@gmail.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/olsen.oyvind.nor@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/olsen.oyvind.nor@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc b/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
index f6b8d59..327176c 100644
--- a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
+++ b/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
@@ -5,8 +5,8 @@ set from = "towerofsilence777@gmail.com"
 set sendmail = "msmtp -a towerofsilence777@gmail.com"
 alias me Tower Of Silence <towerofsilence777@gmail.com>
 set folder = "$MAIL/towerofsilence777@gmail.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/towerofsilence777@gmail.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/towerofsilence777@gmail.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/towerofsilence777@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/towerofsilence777@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
index 8edc344..14916ff 100644
--- a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
+++ b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
@@ -5,8 +5,8 @@ set from = "rbousset@secuserve.com"
 set sendmail = "msmtp -a rbousset@secuserve.com"
 alias me Rudy Bousset <rbousset@secuserve.com>
 set folder = "$MAIL/rbousset@secuserve.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/rbousset@secuserve.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/rbousset@secuserve.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/rbousset@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/rbousset@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
index dc8873d..117109e 100644
--- a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
+++ b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
@@ -5,8 +5,8 @@ set from = "exploitation@secuserve.com"
 set sendmail = "msmtp -a exploitation@secuserve.com"
 alias me Team Exploitation SecuServe <exploitation@secuserve.com>
 set folder = "$MAIL/exploitation@secuserve.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/exploitation@secuserve.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/exploitation@secuserve.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/exploitation@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/exploitation@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/accounts/7-support@secuserve.com.muttrc b/.config/mutt/accounts/7-support@secuserve.com.muttrc
index 480f0e5..a7640ee 100644
--- a/.config/mutt/accounts/7-support@secuserve.com.muttrc
+++ b/.config/mutt/accounts/7-support@secuserve.com.muttrc
@@ -5,8 +5,8 @@ set from = "support@secuserve.com"
 set sendmail = "msmtp -a support@secuserve.com"
 alias me Support SecuServe <support@secuserve.com>
 set folder = "$MAIL/support@secuserve.com"
-set header_cache = $XDG_CACHE_HOME/mutt-wizard/support@secuserve.com/headers
-set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/support@secuserve.com/bodies
+set header_cache = $XDG_CACHE_HOME/mutt/support@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt/support@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
diff --git a/.config/mutt/defaults.muttrc b/.config/mutt/defaults.muttrc
index 353b7c5..702ed60 100644
--- a/.config/mutt/defaults.muttrc
+++ b/.config/mutt/defaults.muttrc
@@ -1,6 +1,6 @@
 # vim: filetype=neomuttrc
-# This file contains all of mutt-wizard's default settings.
-# mutt-wizard will have this file sourced from your muttrc.
+# This file contains all of mutt's default settings.
+# mutt will have this file sourced from your muttrc.
 # In the interest of seamless updating, do not edit this file.
 # If you want to override any settings, set those in your muttrc.
 set editor = "emacsclient -nw -a nvim"
@@ -104,7 +104,7 @@ bind editor <Tab> complete-query
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 macro index O "<shell-escape>fetch_mail.sh<enter>" "run mbsync to sync all mail"
-macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
+macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >$XDG_CACHE_HOME/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat $XDG_CACHE_HOME/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"
 macro compose Y "<first-entry>\
 <pipe-entry>mutt_md2html.sh<enter>\