From cd5c83946b6b43c023c9682db78b7fe3d365a592 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 23 Jul 2022 13:22:23 +0200
Subject: [PATCH] fixing taskwarrior problem

---
 nixos/configs/pepe/taskwarrior-pushover.nix   | 68 +++++++++----------
 nixos/configs/sterni/configuration.nix        |  3 +
 .../modules/services/taskwarrior-autotag.nix  |  3 +-
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/nixos/configs/pepe/taskwarrior-pushover.nix b/nixos/configs/pepe/taskwarrior-pushover.nix
index d6c52b5..6e20e90 100644
--- a/nixos/configs/pepe/taskwarrior-pushover.nix
+++ b/nixos/configs/pepe/taskwarrior-pushover.nix
@@ -1,41 +1,38 @@
 { config, lib, pkgs, ... }:
 
 {
-  sops.secrets.pushoverApiToken = {
-    owner = "taskwarrior-pushover";
-    key = "pushoverApiToken";
-  };
-  sops.secrets.pushoverUserKey = {
-    owner = "taskwarrior-pushover";
-    key = "pushoverUserKey";
-  };
-
-  sops.secrets.pushoverTaskwarriorCa = {
-    owner = "taskwarrior-pushover";
-    key = "taskwarriorCa";
-  };
-  sops.secrets.pushoverTaskwarriorCertificate = {
-    owner = "taskwarrior-pushover";
-    key = "taskwarriorCertificate";
-  };
-  sops.secrets.pushoverTaskwarriorKey = {
-    owner = "taskwarrior-pushover";
-    key = "taskwarriorKey";
-  };
-
-
-  services.taskwarrior-pushover = {
-    enable = true;
-    recurrence = "on";
-    onCalendar = "06:30:00";
-    server = "taskd.ingolf-wagner.de:53589";
-    pushoverApiTokenFile = config.sops.secrets.pushoverApiToken.path;
-    pushoverUserKeyFile = config.sops.secrets.pushoverUserKey.path;
-    caFile = config.sops.secrets.pushoverTaskwarriorCa.path;
-    certificateFile = config.sops.secrets.pushoverTaskwarriorCertificate.path;
-    keyFile = config.sops.secrets.pushoverTaskwarriorKey.path;
-    credentials = "1337/palo/ed0fdbe8-2dc3-408b-84cb-d07d363bccd2";
-  };
+  #sops.secrets.pushoverApiToken = {
+  #  owner = "taskwarrior-pushover";
+  #  key = "pushoverApiToken";
+  #};
+  #sops.secrets.pushoverUserKey = {
+  #  owner = "taskwarrior-pushover";
+  #  key = "pushoverUserKey";
+  #};
+  #sops.secrets.pushoverTaskwarriorCa = {
+  #  owner = "taskwarrior-pushover";
+  #  key = "taskwarriorCa";
+  #};
+  #sops.secrets.pushoverTaskwarriorCertificate = {
+  #  owner = "taskwarrior-pushover";
+  #  key = "taskwarriorCertificate";
+  #};
+  #sops.secrets.pushoverTaskwarriorKey = {
+  #  owner = "taskwarrior-pushover";
+  #  key = "taskwarriorKey";
+  #};
+  #services.taskwarrior-pushover = {
+  #  enable = false;
+  #  recurrence = "off";
+  #  onCalendar = "06:30:00";
+  #  server = "taskd.ingolf-wagner.de:53589";
+  #  pushoverApiTokenFile = config.sops.secrets.pushoverApiToken.path;
+  #  pushoverUserKeyFile = config.sops.secrets.pushoverUserKey.path;
+  #  caFile = config.sops.secrets.pushoverTaskwarriorCa.path;
+  #  certificateFile = config.sops.secrets.pushoverTaskwarriorCertificate.path;
+  #  keyFile = config.sops.secrets.pushoverTaskwarriorKey.path;
+  #  credentials = "1337/palo/ed0fdbe8-2dc3-408b-84cb-d07d363bccd2";
+  #};
 
   sops.secrets.autotagTaskwarriorCa = {
     owner = "taskwarrior-autotag";
@@ -53,6 +50,7 @@
 
   services.taskwarrior-autotag = {
     enable = true;
+    recurrence = "on";
     onCalendar = "hourly";
     server = "taskd.ingolf-wagner.de:53589";
     caFile = config.sops.secrets.autotagTaskwarriorCa.path;
diff --git a/nixos/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix
index 49bd3d5..a2a6963 100644
--- a/nixos/configs/sterni/configuration.nix
+++ b/nixos/configs/sterni/configuration.nix
@@ -94,5 +94,8 @@
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
 
+  # include all modules from flakes
+  # documentation.nixos.includeAllModules = true;
+
 }
 
diff --git a/nixos/modules/services/taskwarrior-autotag.nix b/nixos/modules/services/taskwarrior-autotag.nix
index 4b9deac..40c1d92 100644
--- a/nixos/modules/services/taskwarrior-autotag.nix
+++ b/nixos/modules/services/taskwarrior-autotag.nix
@@ -69,6 +69,7 @@ in
                rc:/var/lib/${name}/.taskrc \
                rc.data.location=/var/lib/${name}/${cfg.dataDir} \
                rc.recurrence=${cfg.recurrence}  \
+               rc.recurrence.confirmation=no \
                rc.taskd.ca=${cfg.caFile} \
                rc.taskd.certificate=${cfg.certificateFile} \
                rc.taskd.credentials="${cfg.credentials}" \
@@ -77,7 +78,7 @@ in
                "$@"
           '';
           set_tag_query = "status:pending '${cfg.query}'";
-          unset_tag_query = "'! ${cfg.query}'";
+          unset_tag_query = "'! ${cfg.query} and +${cfg.tag_name}'";
           yes = "${pkgs.coreutils}/bin/yes";
         in
         ''