From 11d07f2dd87e429bce3b2c50996b74f7c33ad1a7 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 31 Oct 2021 13:16:44 +0100
Subject: [PATCH] mail and packages

---
 nixos/configs/sterni/packages.nix        | 22 +++++++++++-----------
 nixos/configs/workhorse/mail-fetcher.nix | 13 ++++++++++---
 nixos/system/desktop/mail-stuff.nix      |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/nixos/configs/sterni/packages.nix b/nixos/configs/sterni/packages.nix
index 4454afa..096452d 100644
--- a/nixos/configs/sterni/packages.nix
+++ b/nixos/configs/sterni/packages.nix
@@ -23,7 +23,7 @@ in {
       exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
     '')
 
-    #sweethome3d.application
+    sweethome3d.application
     pkgs.polygon-art.polygon-art
 
     # bluetooth gui
@@ -34,24 +34,24 @@ in {
     inkscape
     imagemagick
 
-    #bitwig-studio3
-    #sononym-crawler
-    #darktable
+    bitwig-studio3
+    sononym-crawler
+    darktable
 
     # rust development environment
-    #rustup
-    #jetbrains.clion
+    rustup
+    jetbrains.clion
 
     # general
-    #jetbrains.idea-ultimate
+    jetbrains.idea-ultimate
     #vscode
 
     # python
-    #python3Full
-    #jetbrains.pycharm-professional
-    #jetbrains.datagrip
+    python3Full
+    jetbrains.pycharm-professional
+    jetbrains.datagrip
 
-    #element-desktop
+    element-desktop
 
     #tor-browser-bundle-bin
     #(tor-browser-bundle-bin.overrideAttrs (old: rec {
diff --git a/nixos/configs/workhorse/mail-fetcher.nix b/nixos/configs/workhorse/mail-fetcher.nix
index daeadcb..b8eece6 100644
--- a/nixos/configs/workhorse/mail-fetcher.nix
+++ b/nixos/configs/workhorse/mail-fetcher.nix
@@ -672,7 +672,13 @@ in {
   };
 
   # fetch mails every 10 minutes
-  systemd.services.fetchmail = {
+  systemd.services.fetchmail =
+    let
+      threadTag = tag: ''
+      echo "tag threads with ${tag}"
+      ${pkgs.notmuch}/bin/notmuch tag +${tag} $(${pkgs.notmuch}/bin/notmuch search --output=threads tag:${tag})
+      '';
+    in {
     enable = true;
     serviceConfig = { User = config.users.users.mailUser.name; };
     environment.NOTMUCH_CONFIG =
@@ -690,8 +696,9 @@ in {
       echo "run notmuch"
       ${pkgs.notmuch}/bin/notmuch new
       ${notmuchTaggingNew}
-      echo "mute threads"
-      ${pkgs.notmuch}/bin/notmuch tag +muted $(${pkgs.notmuch}/bin/notmuch search --output=threads tag:muted)
+      ${threadTag "muted"}
+      ${threadTag "wohnung"}
+      ${threadTag "flagged"}
       echo "delete threads"
       ${pkgs.notmuch}/bin/notmuch tag +deleted $(${pkgs.notmuch}/bin/notmuch search --output=threads tag:deleted)
     '';
diff --git a/nixos/system/desktop/mail-stuff.nix b/nixos/system/desktop/mail-stuff.nix
index 1a1d0fe..12f5fa2 100644
--- a/nixos/system/desktop/mail-stuff.nix
+++ b/nixos/system/desktop/mail-stuff.nix
@@ -189,7 +189,7 @@ in {
     set index_format="${index_format} %r |"
     folder-hook 'Discourse.*'            'set sort=reverse-date'
 
-    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:fraud AND NOT tag:junk"
+    virtual-mailboxes "INBOX" "notmuch://?query=(tag:inbox or (tag:sent and not tag:archive)) AND NOT tag:muted AND NOT tag:list AND NOT tag:fraud AND NOT tag:junk"
     virtual-mailboxes "Unread" "notmuch://?query=(tag:unread AND NOT tag:muted)"
     virtual-mailboxes "Space left" "notmuch://?query=((tag:spaceleft OR tag:space-lef) AND NOT tag:muted)"
     virtual-mailboxes "Sononym" "notmuch://?query=(tag:sononym AND NOT tag:muted)"