From af8d6ce122f914b671b443d02cccc2878d0c5a0c Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Fri, 14 Mar 2025 01:15:06 -0400
Subject: [PATCH] AutoYADM commit: 2025-03-14 01:15:06

---
 .config/aerc/accounts.conf     | 54 +++++++++++++++++-----------------
 .config/aerc/personal-map.conf |  2 +-
 .notmuch/hooks/post-new        |  5 ++--
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 0bf5c373..b61a871f 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -19,31 +19,31 @@ default           = INBOX
 copy-to           = Sent
 signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
 
-[Personal-Local]
-source = notmuch://~/.mail/
-maildir-store = ~/.mail/
-maildir-account-path = personal
-query-map = ~/.config/aerc/personal-map.conf
-outgoing          = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025
-outgoing-cred-cmd = pass show proton/bridge
-default           = InboxNM
-from              = Daniel Fichtinger <daniel@ficd.ca>
-copy-to           = Sent
-cache-headers     = true
-signature-file    = /home/fic/mail/daniel@ficd.ca.sig
-check-mail-cmd    = /home/fic/.config/aerc/mail-sync.sh
-exclude-tags = spam,archive,deleted
+# [Personal-Local]
+# source = notmuch://~/.mail/
+# maildir-store = ~/.mail/
+# maildir-account-path = personal
+# query-map = ~/.config/aerc/personal-map.conf
+# outgoing          = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025
+# outgoing-cred-cmd = pass show proton/bridge
+# default           = InboxNM
+# from              = Daniel Fichtinger <daniel@ficd.ca>
+# copy-to           = Sent
+# cache-headers     = true
+# signature-file    = /home/fic/mail/daniel@ficd.ca.sig
+# check-mail-cmd    = /home/fic/.config/aerc/mail-sync.sh
+# exclude-tags = spam,archive,deleted
 
-[School-Local]
-source = notmuch://~/.mail/
-maildir-store = ~/.mail/
-maildir-account-path = school
-query-map = ~/.config/aerc/school-map.conf
-outgoing          = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587
-outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
-default           = InboxNM
-from              = Daniel Fichtinger <fichtinger.d@queensu.ca>
-copy-to           = Sent
-signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
-check-mail-cmd    = /home/fic/.config/aerc/mail-sync.sh
-exclude-tags = spam,archive,deleted
+# [School-Local]
+# source = notmuch://~/.mail/
+# maildir-store = ~/.mail/
+# maildir-account-path = school
+# query-map = ~/.config/aerc/school-map.conf
+# outgoing          = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587
+# outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
+# default           = InboxNM
+# from              = Daniel Fichtinger <fichtinger.d@queensu.ca>
+# copy-to           = Sent
+# signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
+# check-mail-cmd    = /home/fic/.config/aerc/mail-sync.sh
+# exclude-tags = spam,archive,deleted
diff --git a/.config/aerc/personal-map.conf b/.config/aerc/personal-map.conf
index 0df38834..11135682 100644
--- a/.config/aerc/personal-map.conf
+++ b/.config/aerc/personal-map.conf
@@ -1,2 +1,2 @@
-InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:sent
 SentNM=from:daniel@ficd.ca or from:ficcdaf@proton.me or from:isafic@proton.me
diff --git a/.notmuch/hooks/post-new b/.notmuch/hooks/post-new
index 8a01c593..592e8b4d 100755
--- a/.notmuch/hooks/post-new
+++ b/.notmuch/hooks/post-new
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-notmuch tag +school -new -- "is:new path:school/**"
-notmuch tag +personal -new -- "is:new path:personal/**"
+notmuch tag +school -new -- "path:school/**"
+# notmuch tag +inbox -new -- "path:*/INBOX/*"
+notmuch tag +personal -new -- "path:personal/**"