From 26c247677e662199b6166b34d1f5b10637aebbec Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 2 Sep 2022 12:48:37 +0200
Subject: [PATCH] update taskwarrior

---
 flake.lock                                  |  8 ++---
 nixos/configs/pepe/taskwarrior-pushover.nix | 36 +--------------------
 nixos/configs/sterni/packages.nix           |  2 ++
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3414d82..8889184 100644
--- a/flake.lock
+++ b/flake.lock
@@ -878,11 +878,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1642346088,
-        "narHash": "sha256-6eCncK+8z+ynx/27RQXZ+TQ+ska6O+4Fext6m9UeJlQ=",
+        "lastModified": 1662108349,
+        "narHash": "sha256-qZzm63tzvAuMD30plHfaTsb2tyZbqFv9NT/hy7JRYRQ=",
         "ref": "main",
-        "rev": "13da61941ec17320e368c035755870ad3df38395",
-        "revCount": 30,
+        "rev": "deec5460d8b298fd4733e766e144498a10883209",
+        "revCount": 31,
         "type": "git",
         "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git"
       },
diff --git a/nixos/configs/pepe/taskwarrior-pushover.nix b/nixos/configs/pepe/taskwarrior-pushover.nix
index 6e20e90..0f63d28 100644
--- a/nixos/configs/pepe/taskwarrior-pushover.nix
+++ b/nixos/configs/pepe/taskwarrior-pushover.nix
@@ -1,39 +1,6 @@
 { 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 = 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";
     key = "taskwarriorCa";
@@ -47,7 +14,6 @@
     key = "taskwarriorKey";
   };
 
-
   services.taskwarrior-autotag = {
     enable = true;
     recurrence = "on";
@@ -56,7 +22,7 @@
     caFile = config.sops.secrets.autotagTaskwarriorCa.path;
     certificateFile = config.sops.secrets.autotagTaskwarriorCertificate.path;
     keyFile = config.sops.secrets.autotagTaskwarriorKey.path;
-    credentials = "1337/palo/ed0fdbe8-2dc3-408b-84cb-d07d363bccd2";
+    credentials = "1337/palo/ad40dce8-4b38-4011-b032-60a91b6f22cd";
   };
 
 }
diff --git a/nixos/configs/sterni/packages.nix b/nixos/configs/sterni/packages.nix
index 14c423d..d8aab07 100644
--- a/nixos/configs/sterni/packages.nix
+++ b/nixos/configs/sterni/packages.nix
@@ -86,6 +86,8 @@ in
     #  };
     #}))
 
+    sops
+
   ];
 
   home-manager.users.mainUser = {