Преглед изворни кода

[mail] Update notmuch and afew configs

Colin Powell пре 4 година
родитељ
комит
9eb74b96bf
6 измењених фајлова са 38 додато и 50 уклоњено
  1. 31 43
      mail/.config/afew/config
  2. 3 3
      mail/.mbsyncrc
  3. 2 2
      mail/.msmtprc
  4. 2 2
      mail/.notmuch-config
  5. BIN
      netrc/.authinfo.gpg
  6. BIN
      netrc/.netrc.gpg

+ 31 - 43
mail/.config/afew/config

@@ -2,82 +2,70 @@
 
 [SpamFilter]
 [KillThreadsFilter]
-[ListMailsFilter]
-[MeFilter]
-[ArchiveSentMailsFilter]
-[InboxFilter]
-sent_tag = sent
+[DMARCReportInspectionFilter]
 
+[FolderNameFilter]
+folder_lowercases = true
+maildir_separator = /
 
-# add specific tags
+[ArchiveFilter]
 
-[Filter.0]
-query = 'to:colin.powell@15five.com'
-tags = +15five;+work
-message = 15Five message
+[ArchiveSentMailsFilter]
+sent_tag = sent
 
-[Filter.1]
-query = 'to:colin@castine.town'
-tags = +muni
-message = Selectboard message
+[InboxFilter]
 
-[Filter.2]
-query = 'to:colin@unbl.ink'
-tags = +personal
-message = Personal message
+# add specific tags
 
 # Jira tag as Jira
-[Filter.3]
+[Filter.1]
 query = 'from:jira@15five-dev.atlassian.net'
 tags = +jira;-inbox
 message = Jira message
 
 # Orgmode
-[Filter.4]
+[Filter.2]
 query = 'emacs-orgmode'
 tags = -new;-inbox;+orgmode
 message = orgmode message
 
 # Delete some spam
-[Filter.5]
-query = '\'Office365 Message Center\' via Developers OR from:admin@darntough.com OR from:govdelivery@subscriptions.defense.gov OR from:notifications@facebookmai.com OR from:MPP@em.home.dell.com'
+[Filter.3]
+query = '\'Office365 Message Center\' via Developers OR from:govdelivery@subscriptions.defense.gov OR from:notifications@facebookmai.com OR from:MPP@em.home.dell.com'
 tags = -inbox;+spam
 message = spam message
 
 # Tag interview emails
-[Filter.6]
+[Filter.4]
 query = 'subject:Interview'
 tags = -inbox;+interview
 message = personal message
 
-# F5bot - not quite spam, but I don't want to see it
-[Filter.8]
-query = 'from:admin@f5bot.com'
-tags = -inbox;-new;+f5
-message = f5 message
-
 # Emacs Conf
-[Filter.9]
+[Filter.6]
 query = 'to:emacsconf-discuss@gnu.org'
 tags = -inbox;-new;+emacsconf
 message = emacsconf message
 
-# Sentry errors, skip the inbox, tag as sentry
-[Filter.10]
-query = 'from:noreply@md.getsentry.com'
-tags = -inbox;-new;+sentry
-message = sentry error
-
-[Filter.11]
+[Filter.7]
 query = 'from:notifications@github.com'
 tags = -inbox;+github
 message = Github message
 
 [MailMover]
-folders = INBOX Junk Archive Sent
+folders = colin@unbl.ink/INBOX colin@unbl.ink/Archive colin@unbl.ink/Trash colin@castine.town/INBOX colin@castine.town/Archive colin@castine.town/Trash
+
 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
+max_age = 15
+
+colin@unbl.ink/INBOX = 'tag:spam':colin@unbl.ink/Junk 'NOT tag:inbox':colin@unbl.ink/Archive 'tag:trash':colin@unbl.ink/Trash
+colin@unbl.ink/Archive = 'tag:inbox':colin@unbl.ink/INBOX 'tag:trash':colin@unbl.ink/Trash
+colin@unbl.ink/Trash = 'tag:inbox':colin@unbl.ink/INBOX 'tag:archive':colin@unbl.ink/Archive
+
+colin@castine.town/INBOX = 'tag:spam':colin@castine.town/Junk 'NOT tag:inbox':colin@castine.town/Archive 'tag:trash':colin@castine.town/Trash
+colin@castine.town/Archive = 'tag:inbox':colin@castine.town/INBOX 'tag:trash':colin@castine.town/Trash
+colin@castine.town/Trash = 'tag:inbox':colin@castine.town/INBOX 'tag:archive':colin@castine.town/Archive
+
+secstate@sdf.org/INBOX = 'tag:spam':secstate@sdf.org/Junk 'NOT tag:inbox':secstate@sdf.org/Archive 'tag:trash':secstate@sdf.org/Trash
+secstate@sdf.org/Archive = 'tag:inbox':secstate@sdf.org/INBOX 'tag:trash':secstate@sdf.org/Trash
+secstate@sdf.org/Trash = 'tag:inbox':secstate@sdf.org/INBOX 'tag:archive':secstate@sdf.org/Archive

+ 3 - 3
mail/.mbsyncrc

@@ -11,7 +11,7 @@ account unblink
 MaildirStore unblink-local
 # trailing "/" is important
 Path ~/Mail/colin@unbl.ink/
-Inbox ~/Mail/colin@unbl.ink/Inbox
+Inbox ~/Mail/colin@unbl.ink/INBOX
 Trash Trash
 
 Channel unblink-folders
@@ -38,7 +38,7 @@ account castine
 MaildirStore castine-local
 # trailing "/" is important
 Path ~/Mail/colin@castine.town/
-Inbox ~/Mail/colin@castine.town/Inbox
+Inbox ~/Mail/colin@castine.town/INBOX
 Trash Trash
 
 Channel castine-folders
@@ -65,7 +65,7 @@ account sdf
 MaildirStore sdf-local
 # trailing "/" is important
 Path ~/Mail/secstate@sdf.org/
-Inbox ~/Mail/secstate@sdf.org/Inbox
+Inbox ~/Mail/secstate@sdf.org/INBOX
 Trash Trash
 
 Channel sdf-folders

+ 2 - 2
mail/.msmtprc

@@ -8,7 +8,7 @@ port           587
 from           colin@unbl.ink
 user           colin@unbl.ink
 tls            on
-tls_fingerprint 6C:8F:F5:2E:3C:1A:82:57:A2:D2:A1:1F:0E:70:19:D5:94:ED:4C:77:74:EF:8C:C0:37:B0:1A:DE:0E:CC:14:F9
+tls_fingerprint 01:4D:83:B8:BE:9A:3E:5F:F7:29:8B:97:F1:B7:54:FA:65:2C:BC:C6:64:0E:08:E6:BB:26:08:51:9A:60:6C:B7
 passwordeval   pass personal/colin@unbl.ink
 #############################
 
@@ -20,7 +20,7 @@ port           587
 from           colin@castine.town
 user           colin@castine.town
 tls            on
-tls_fingerprint 9C:A0:A5:11:2A:FE:D4:C5:95:C2:B1:F3:2D:F4:96:7F:A9:1C:09:D1:87:E9:CA:59:A9:D0:0A:23:AD:70:3C:1D
+tls_fingerprint CD:FB:A4:72:5A:9C:5C:77:23:05:9E:FD:C5:CB:62:BE:D5:71:6D:86:7F:5F:A2:AF:51:51:00:8A:3D:C4:66:71
 passwordeval   pass personal/colin@castine.town
 #############################
 

+ 2 - 2
mail/.notmuch-config

@@ -11,10 +11,10 @@ tags=new
 ignore=.mbsyncstate;.isncuidmap.db;.uidvalidity
 
 [search]
-exclude_tags=deleted;trash;spam;muted
+exclude_tags=spam;muted
 
 [maildir]
-synchronize_flags=false
+synchronize_flags=true
 
 [crypto]
 gpg_path=/usr/local/bin/gpg

BIN
netrc/.authinfo.gpg