mail: Fix mail filtering

Fixed correct filtering of inbox stuff in afew (moving archived mails
out of inbox, moving trash into GMail Trash).

mail/.config/aerc/binds.conf

@@ -42,9 +42,10 @@ D = :prompt 'Really delete this message?' 'delete-message'<Enter>
 mi = :modify-labels +inbox -archived -deleted<Enter>
 mm = :modify-labels +flagged<Enter>
 mI = :modify-labels +flagged<Enter>
+dd = :modify-labels +deleted -inbox<Enter>
 md = :modify-labels +deleted -inbox<Enter>
-mD = :modify-labels -deleted <Enter>
-ma = :modify-labels -deleted -inbox<Enter>
+mD = :modify-labels -deleted<Enter>
+ma = :modify-labels -inbox -deleted<Enter>
 
 C = :compose<Enter>
 

mail/.config/afew/config

@@ -1,6 +1,6 @@
 # filter creation
 [InboxDumpingFilter(Filter)]
-query = '(tag:dump or folder:Dump) and (tag:inbox or tag:unread)'
+query = (tag:dump or folder:Dump) and (tag:inbox or tag:unread or tag:new)
 tags = -new;-inbox;-unread;+dump
 message = removing dumped mails from inbox
 
@@ -11,8 +11,8 @@ folder_transforms = Dump:dump
 maildir_separator = /
 [ArchiveSentMailsFilter]
 sent_tag=sent
-[InboxFilter]
 [InboxDumpingFilter.0]
+[InboxFilter]
 
 # moving mode
 [MailMover]
@@ -20,5 +20,5 @@ folders = Inbox Dump
 rename = True
 max_age = 15
 # rules
-Inbox = 'tag:dump':Dump
+Inbox = 'tag:dump':Dump 'NOT tag:inbox AND NOT tag:dump AND NOT tag:spam':'[Google Mail]/All Mail' 'tag:deleted':'[Google Mail]/Trash'
 Dump = 'NOT tag:spam AND NOT tag:dump AND tag:inbox':Inbox

mail/.local/bin/mail-check

@@ -32,7 +32,9 @@ posthook() {
   fi
 
   notmuch new 2>/dev/null
-  afew --tag --new -C "${XDG_CONFIG_HOME:-/home/marty/.config}/notmuch/config"
+  afew --tag --new
+  afew --move-mail --new
+  afew --tag --new
   countnew
 }