summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el3
-rwxr-xr-x.fmail/.notmuch/hooks/post-new9
-rw-r--r--.mbsyncrc8
3 files changed, 15 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 98f1a48b..0d848420 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1092,7 +1092,8 @@
(setq notmuch-tagging-keys
'(("u" ("+unread") "Mark as unread")
("s" ("+spam") "Mark as spam")
- ("m" ("+killed") "Kill thread"))) ; 'm' for 'mute'
+ ("m" ("+killed") "Kill thread") ; 'm' for 'mute'
+ ("d" ("+deleted") "Send to trash")))
;; this ensures that hitting C-x m right after Emacs starts yields a
;; message with the correct From: address and User-Agent header, etc.
diff --git a/.fmail/.notmuch/hooks/post-new b/.fmail/.notmuch/hooks/post-new
index 3f239be4..5e1ef6c9 100755
--- a/.fmail/.notmuch/hooks/post-new
+++ b/.fmail/.notmuch/hooks/post-new
@@ -35,3 +35,12 @@ fi
# mark all spam as spam
notmuch tag +spam -- folder:spam
+
+# ensure all deleted messages are in the trash folder
+floating_deleted=$(notmuch search --output=files -- tag:deleted)
+if [ ! -z "$floating_deleted" ]; then
+ mdmv $floating_deleted $HOME/.fmail/trash
+fi
+
+# mark all trash as trash
+notmuch tag +deleted -- folder:trash
diff --git a/.mbsyncrc b/.mbsyncrc
index 82feba95..e43dc27d 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -62,9 +62,9 @@ Channel fmaild
Master :fmimap:Drafts
Slave :fmmaildir:drafts
-# Channel fmailt
-# Master :fmimap:INBOX/Trash
-# Slave :fmmaildir:trash
+Channel fmailt
+Master :fmimap:Trash
+Slave :fmmaildir:trash
Channel debian
Master :fmimap:Lists/Debian
@@ -99,7 +99,7 @@ Group fastmail
Channel fmaili
Channel fmails
Channel fmaild
-# Channel fmailt
+Channel fmailt
# Channel fmaila
Channel debian
Channel dbulk