From d99b87c53489279fbea4ed27518f6087f580e3c8 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Tue, 22 Sep 2020 17:33:50 -0400
Subject: [PATCH] [notmuch] Cleaning up checkmail script and new afew rules

---
 bin/.bin/checkmail       |  4 ++--
 mail/.config/afew/config | 42 +++++++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/bin/.bin/checkmail b/bin/.bin/checkmail
index da9fa4e..81bf707 100755
--- a/bin/.bin/checkmail
+++ b/bin/.bin/checkmail
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-afew --m --new
+afew -m -n
 mbsync -a
 notmuch new
-afew --tag --new
+afew -t -n
 exit 0
diff --git a/mail/.config/afew/config b/mail/.config/afew/config
index 6d36472..0366190 100644
--- a/mail/.config/afew/config
+++ b/mail/.config/afew/config
@@ -28,32 +28,52 @@ message = sentry error
 # Jira tag as Jira
 [Filter.3]
 query = 'from:jira@15five-dev.atlassian.net'
-tags = +jira;-inbox;+15five
+tags = +jira;-inbox;+15five;-unread
 message = jira message
 
-# CMT
+# Orgmode
 [Filter.4]
 query = 'to:emacs-orgmode@gnu.org'
 tags = +orgmode;-inbox;-unread
-message = cmt uucc message
+message = orgmode message
 
-# Delete Office465/Microsoft messages
+# Delete some spam
 [Filter.5]
-query = '\'Office365 Message Center\' via Developers'
-tags = +ms;+ffjunk;-inbox;-new;-unread;+uucc
-message = cmt uucc message
+query = '\'Office365 Message Center\' via Developers OR from:admin@darntough.com OR from:govdelivery@subscriptions.defense.gov OR from:notifications@facebookmail.com OR from:MPP@em.home.dell.com OR from:info@jaimeharrison.com'
+tags = +spam;-inbox;-unread
+message = spam message
 
 # Tag interview emails
 [Filter.6]
 query = 'subject:Interview'
-tags = +interview;-inbox;-new;-unread
+tags = +interview;-inbox;-unread
 message = personal message
 
+# F5bot - not quite spam, but I don't want to see it
+[Filter.8]
+query = 'from:admin@f5bot.com'
+tags = +f5;-inbox;-unread
+message = f5 message
+
+# Emacs Conf
+[Filter.9]
+query = 'to:emacsconf-discuss@gnu.org'
+tags = +emacsconf;-inbox
+message = emacsconf message
+
+# Github notifications
+[Filter.10]
+query = 'from:notifications@github.com'
+tags = +github;-inbox
+message = github message
+
 [MailMover]
-folders = Inbox Junk
-rename = False
-max_age = 15
+folders = Inbox Junk Archive Sent
+rename = True
+max_age = 45
 Inbox = 'tag:spam':Junk 'NOT tag:inbox':Archive 'tag:deleted':Trash 'tag:sent':Sent
+Archive = 'tag:inbox':Inbox 'tag:deleted':Trash
+Sent = 'tag:inbox':Inbox 'tag:deleted':Trash
 Junk = 'NOT tag:spam AND tag:inbox':Inbox 'NOT tag:spam':Archive
 
 # what's still new goes into the inbox