From fbf9278e940e1cd2b457bb0dc46cb98e6f68d6d6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 5 Nov 2020 00:24:09 +0100
Subject: [PATCH] mail: configure tags and filters

---
 configs/workhorse/mail-fetcher.nix | 19 +++++++++++++------
 system/desktop/mail-stuff.nix      |  8 ++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/configs/workhorse/mail-fetcher.nix b/configs/workhorse/mail-fetcher.nix
index 6d4a579..1715846 100644
--- a/configs/workhorse/mail-fetcher.nix
+++ b/configs/workhorse/mail-fetcher.nix
@@ -19,8 +19,8 @@ let
       tags = [ "+jobs" "-inbox" ];
     }
     {
-      query = "from:no-reply@backtrace.io";
-      tags = [ "+sononym" "-inbox" "-unread" ];
+      query = "from:no-reply@backtrace.io OR to:sononym@noreply.github.com";
+      tags = [ "+sononym" "-inbox" ];
     }
     {
       query = "from:ebay.com OR from:ebay.de OR from:ebay.net";
@@ -45,7 +45,7 @@ let
     }
     {
       query = "from:space-left.org";
-      tags = [ "+space-left" ];
+      tags = [ "+spaceleft" "+list" ];
     }
     {
       query = "from:landr.com";
@@ -219,6 +219,14 @@ let
       query = "from:notifications@github.com";
       tags = [ "+github" ];
     }
+    {
+      query = "to:NUR@noreply.github.com";
+      tags = [ "+nur" "+nixos" "+list" ];
+    }
+    {
+      query = "to:nixpkgs@noreply.github.com";
+      tags = [ "+nixpkgs" "+nixos" "+list" ];
+    }
     {
       query = "from:travis-ci.org AND subject:mrVanDalo/navi";
       tags = [ "+development" "+navi" ];
@@ -237,7 +245,7 @@ let
     }
     {
       query = "from:nixos1@discoursemail.com";
-      tags = [ "+nixos" "+discourse" ];
+      tags = [ "+nixos" "+discourse" "+list" ];
     }
     {
       query = "from:nixos1@discoursemail.com AND subject:Development";
@@ -349,7 +357,7 @@ let
     }
     {
       query = "to:c-base.org";
-      tags = [ "+cbase" ];
+      tags = [ "+cbase" "+list" ];
     }
     {
       query = "to:c-base.org AND subject=[auto-report]";
@@ -418,7 +426,6 @@ let
       tags = [ "-new" ];
       message = "remove new tag at the end";
     }
-
   ];
 
   notmuchTagging = let
diff --git a/system/desktop/mail-stuff.nix b/system/desktop/mail-stuff.nix
index 83e3abc..59755ae 100644
--- a/system/desktop/mail-stuff.nix
+++ b/system/desktop/mail-stuff.nix
@@ -226,9 +226,13 @@ in {
 
     set index_format="${index_format} %r |"
 
-    virtual-mailboxes "INBOX" "notmuch://?query=(tag:inbox or (tag:sent and not tag:archive)) AND NOT tag:discourse AND NOT tag:muted"
+    virtual-mailboxes "INBOX" "notmuch://?query=(tag:inbox or (tag:sent and not tag:archive)) AND NOT tag:discourse AND NOT tag:muted AND NOT tag:list AND NOT tag:billing"
     virtual-mailboxes "Unread" "notmuch://?query=(tag:unread AND NOT tag:muted)"
-    virtual-mailboxes "Space left" "notmuch://?query=(to:discuss@space-left.org AND NOT tag:muted)"
+    virtual-mailboxes "Space left" "notmuch://?query=(tag:spaceleft AND NOT tag:muted)"
+    virtual-mailboxes "Sononym" "notmuch://?query=(tag:sononym AND NOT tag:muted)"
+    virtual-mailboxes "c-base" "notmuch://?query=(tag:cbase AND NOT tag:muted)"
+    virtual-mailboxes "shopping" "notmuch://?query=((tag:billing OR tag:shopping) AND NOT tag:muted)"
+    virtual-mailboxes "NixOS Github" "notmuch://?query=(tag:github AND tag:nixos AND NOT tag:muted)"
     virtual-mailboxes "Discourse.all" "notmuch://?query=(tag:discourse AND NOT tag:muted)"
     virtual-mailboxes "Discourse.development" "notmuch://?query=(tag:discourse AND tag:development AND NOT tag:muted)"
     virtual-mailboxes "Discourse.announcements" "notmuch://?query=(tag:discourse AND tag:announcements AND NOT tag:muted)"