From 93830da481aa5c85799767d6617f5a0e88392fca Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Mon, 12 Dec 2022 10:28:32 -0600
Subject: dell: brought X11 setup up to par with sway

---
 .mutt/muttrc   |  8 ++++----
 .mutt/personal | 27 +++++++++++++++------------
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to '.mutt')

diff --git a/.mutt/muttrc b/.mutt/muttrc
index ee7f6ba..b93fdb7 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -63,7 +63,7 @@ bind index <space>  collapse-thread
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
 # Sync email
-macro index O "<shell-escape>mbsync personal<enter>" "run mbsync to sync all mail"
+macro index O "<shell-escape>mbsync personal<enter> <shell-escape>notmuch new<enter>" "run mbsync to sync all mail"
 macro index o "<shell-escape>mbsync personal:INBOX<enter>" "run mbsync to sync inbox"
 
 # Saner copy/move dialogs
@@ -78,6 +78,7 @@ macro index,pager ga "<change-folder>=Archive<enter>" "Go to all mail"
 macro index,pager gb "<change-folder>=Bookmarks<enter>" "Go to Bookmarks"
 macro index,pager gt "<change-folder>=Starred<enter>" "Go to starred messages"
 macro index,pager gs "<change-folder>=Sent<enter>" "Go to starred messages"
+macro index ,n "<next-unread-mailbox><enter><next-new-then-unread><enter>" "Go to new mail"
 #Save a message to my notes folder
 macro index,pager N "<pipe-message>~/bin/mqq.sh " 
 
@@ -141,7 +142,7 @@ bind compose p postpone-message
 bind index p recall-message
 
 #set query_command = "contacts -Sf '%eTOKEN%n' '%s' | sed -e 's/TOKEN/\t/g'"
-set query_command = "abook --mutt-query '%s'"
+set query_command = "khard email --parsable %s"
 bind editor <Tab> complete-query
 bind editor ^T    complete
 set editor="vim -c 'set spell spelllang=en'" 
@@ -154,8 +155,7 @@ macro index S "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --
 
 macro index <F9> "<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thread<enter><change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter><enter-command>set wait_key<enter>" "notmuch: reconstruct thread"
 
-#macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
-macro index,pager A "<pipe-message>abook --add-email<return>" "add the sender address to abook"
+macro index,pager A "<pipe-message>khard add-email<return>" "add the sender email address to khard"
 
 set spoolfile = "+INBOX"
 source ~/.mutt/personal
diff --git a/.mutt/personal b/.mutt/personal
index e90d825..b727bb6 100644
--- a/.mutt/personal
+++ b/.mutt/personal
@@ -18,17 +18,20 @@ mailboxes =INBOX \
           +Bookmarks \
           +Darktable \
           +Sent \
-          +'Old Mail.2008' \
-          +'Old Mail.2009' \
-          +'Old Mail.2010' \
-          +'Old Mail.2011' \
-          +'Old Mail.2012' \
-          +'Old Mail.2013' \
-          +'Old Mail.2014' \
-          +'Old Mail.2015' \
-          +'Old Mail.2016' \
-          +'Old Mail.2017' \
-          +'Old Mail.2018' \
-          +'Old Mail.2019' \
+          +Starred \
+          +Old\ Mail/2008 \
+          +Old\ Mail/2009 \
+          +Old\ Mail/2010 \
+          +Old\ Mail/2011 \
+          +Old\ Mail/2012 \
+          +Old\ Mail/2013 \
+          +Old\ Mail/2014 \
+          +Old\ Mail/2015 \
+          +Old\ Mail/2016 \
+          +Old\ Mail/2017 \
+          +Old\ Mail/2018 \
+          +Old\ Mail/2019 \
+          +Old\ Mail/2020 \
+          +Old\ Mail/2021 \
           +Drafts \
           +temporary/search
-- 
cgit v1.2.3-70-g09d2