drop feeds & patches maildirs

No need to separate feeds from lists at the maildir level.

With mailscripts 0.20, no need for a separate folder for imported
patches, as they can be distinguished by subject line.

4 files changed, 3 insertions, 13 deletions

diff --git a/.config/mailscripts/notmuch-import-patch b/.config/mailscripts/notmuch-import-patch
new file mode 100644
index 00000000..1ac7a532
--- /dev/null
+++ b/.config/mailscripts/notmuch-import-patch
@@ -0,0 +1 @@
+maildir = /home/spwhitton/.fmail/inbox
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6fefa6e1..b20a02fe 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1115,7 +1115,7 @@ Two ways to read:
     (add-to-list 'notmuch-saved-searches
                  '(:name "imported series" :key "P" :search-type nil
                          :sort-order newest-first
-                         :query "folder:patches") t)
+                         :query "subject:\"/PATCH .+ imported/\"") t)
 
     ;; finally, groups/lists where I don't know how or whether I want to
     ;; follow them; I may have subscribed just to post something
diff --git a/.mbsyncrc b/.mbsyncrc
index b9a366af..2fd914c5 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -74,14 +74,6 @@ Channel          fmailt
 Master           :fmimap:Trash
 Slave            :fmmaildir:trash
 
-Channel          patches
-Master           :fmimap:"Imported series"
-Slave            :fmmaildir:patches
-
-Channel          feeds
-Master           :fmimap:Feeds
-Slave            :fmmaildir:feeds
-
 Channel          spamtraining
 Master           :fmimap:Training/Spam
 Slave            :fmmaildir:spam
@@ -103,7 +95,5 @@ Channel          fmailt
 Channel          lists
 # Channel          fmaila
 # Channel          notes
-Channel          patches
-Channel          feeds
 Channel          spamtraining
 Channel          hamtraining
diff --git a/bin/annexfmail b/bin/annexfmail
index ff9e4ae3..b18008fe 100755
--- a/bin/annexfmail
+++ b/bin/annexfmail
@@ -14,8 +14,7 @@ use POSIX qw(strftime);
 our $maildirs        = "$ENV{HOME}/.fmail";
 our $mboxes          = "$ENV{HOME}/annex/mail";
 our $expanded_mboxes = "$ENV{HOME}/.fmail/annex";
-our %names
-  = (inbox => 'archive', sent => 'sent', feeds => 'feeds', lists => 'lists');
+our %names = (inbox => 'archive', sent => 'sent', lists => 'lists');
 our @annex_sync_remotes = qw(origin cloud);
 
 # CODE