From fb36c8dda298f657c75edd8eb12eff26175deb7f Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Tue, 16 Mar 2021 13:43:56 -0400
Subject: [PATCH] Various tweaks

---
 mutt/macros.rc    |  2 +-
 mutt/mailboxes.rc |  2 ++
 mutt/muttrc       | 19 +++++++++++++++++--
 mutt/notmuch.rc   |  4 +++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mutt/macros.rc b/mutt/macros.rc
index 6ec9f63..dbcc1ac 100644
--- a/mutt/macros.rc
+++ b/mutt/macros.rc
@@ -24,4 +24,4 @@ macro index - "<modify-labels>-*\\n<sync-mailbox>"               # tag as unstar
 macro attach A "<pipe-message>/home/kellya/projects/public/mutt-filters/vcalendar-filter | /home/kellya/projects/public/khal/misc/mutt2khal<enter>"
 
 # Archive
-macro index A ":set confirmappend=no delete=yes\n<save-message>=archive\n<sync-mailbox>:set confirmappend=no delete=yes\n<modify-labels>+archive -unread -inbox\\n"
+# macro index A ":set confirmappend=no delete=yes\n<save-message>=archive\n<sync-mailbox>:set confirmappend=no delete=yes\n<modify-labels>+archive -unread -inbox\\n"
diff --git a/mutt/mailboxes.rc b/mutt/mailboxes.rc
index b5b16b1..786635e 100644
--- a/mutt/mailboxes.rc
+++ b/mutt/mailboxes.rc
@@ -1,4 +1,6 @@
 mailboxes \
   "+arachnitech/INBOX" \
+  "+arachnitech/Blockchain" \
   "+franklin/INBOX" \
+  "+franklin/Archive" \
   "+franklin/Sent"
diff --git a/mutt/muttrc b/mutt/muttrc
index 11d7cab..0ec8cec 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,5 +1,17 @@
 #set record=~/Maildir/arachnitech/Sent
 set sidebar_visible = yes
+set sidebar_short_path                  # Shorten mailbox names
+set sidebar_delim_chars="/"             # Delete everything up to the last / character
+set sidebar_folder_indent               # Indent folders whose names we've shortened
+set sidebar_indent_string="  "          # Indent with two spaces
+color sidebar_new yellow default
+color sidebar_indicator default color17         # Dark blue background
+color sidebar_highlight white   color238        # Grey background
+color sidebar_spoolfile yellow  default         # Yellow
+color sidebar_new       green   default         # Green
+color sidebar_ordinary  default default         # Default colors
+color sidebar_flagged   red     default         # Red
+color sidebar_divider   color8  default         # Dark grey
 ## set record="~/Maildir/Sent Mail"
 set spoolfile="+franklin/INBOX"
 # set header cache
@@ -7,11 +19,14 @@ set header_cache=~/Localmail/hcache
 set mbox_type=Maildir
 set folder=~/Maildir/
 set sort=reverse-date-received
+set pager_stop=yes
+set fast_reply
+set include=yes
 # IMAP and INBOX (this should map to any existing IMAP folders)
 folder-hook arachnitech/* source ~/.mutt/accounts/arachnitech
 folder-hook franklin/* source ~/.mutt/accounts/franklin
 # auto_view text/html
-alternative_order text/plain text/enriched text/html
+#alternative_order text/plain text/enriched text/html
 auto_view text/html
 auto_view text/calendar
 
@@ -19,7 +34,7 @@ auto_view text/calendar
 set confirmappend=yes
 set delete=yes
 # Show new notification when mail arrives
-set new_mail_command="notify-send --icon='/home/kellya/images/mutt-1.png' \
+set new_mail_command="notify-send -t 2000 --icon='/home/kellya/images/mutt-1.png' -a mutt -c mail \
    'New Emails' '%n new messages' &"
 
 # Run a script to cat anything that has .rc as the extension to auto source things
diff --git a/mutt/notmuch.rc b/mutt/notmuch.rc
index 7de1889..695383d 100644
--- a/mutt/notmuch.rc
+++ b/mutt/notmuch.rc
@@ -1,2 +1,4 @@
 set nm_default_url = "notmuch:///home/kellya/Maildir"
-virtual-mailboxes "My INBOX" "notmuch://?query=tag:inbox"
+virtual-mailboxes "Universal Inbox" "notmuch://?query=tag:inbox"
+virtual-mailboxes "Arachnitech INBOX" "notmuch://?query=tag:inbox&query=to:*arachnitech.com"
+virtual-mailboxes "Franklin INBOX" "notmuch://?query=tag:inbox&query=to:*franklin.edu"