From cbf950d650370211e254ac776c5f8bcdca6912d5 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 2 Apr 2025 11:41:16 -0400 Subject: [PATCH] big update and trying taskwarrior again --- flake.lock | 48 ++++++++++++++++++++-------------------- homes/emenel/default.nix | 1 + homes/media/default.nix | 26 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index cf21d4f..fcd3b80 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1743527799, - "narHash": "sha256-YbpRE9BakzzB5sxeb/ib5OmMQyR4S5gdhFaFHhAbGcs=", + "lastModified": 1743584818, + "narHash": "sha256-6iCK1WgpULxnqg8iPgEVpEZ5nqZI0OBIi19sYCVuG58=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "546597a40c0f033b319ea9b64ff40e1aaaee2faf", + "rev": "b2863692cfdfa842ee357d7d93e9c781feb92dc7", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1743527271, - "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=", + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -744,11 +744,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743515240, - "narHash": "sha256-GViZweKJvQlesFGpAom4LZloNtmT5XIJQuWj/qRrnl8=", + "lastModified": 1743563355, + "narHash": "sha256-CfKmrac0Ru5yiCFRGhzyJ6P/ynFlMCsEBnMn+nKdxLs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9972796ee8c3e75e8be3c6ce48ca6e30f65f2117", + "rev": "829f6a4eef6081fbd28bdc3351e1a6915047fba9", "type": "github" }, "original": { @@ -965,11 +965,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743501102, + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", "type": "github" }, "original": { @@ -981,11 +981,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743501102, + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1743501102, + "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ ] }, "locked": { - "lastModified": 1743502316, - "narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=", + "lastModified": 1743604509, + "narHash": "sha256-Hf5aYGP3hP+uNbcd4NrEMUAR+1o518uGzoeVyMzzJwo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8", + "rev": "4521de68fba1a36fae8caebce3d6e047179661f7", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 02dcf5d..81ca072 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -10,6 +10,7 @@ music langs emacs + taskwarrior ]; home = { diff --git a/homes/media/default.nix b/homes/media/default.nix index 50f04b8..8bda772 100644 --- a/homes/media/default.nix +++ b/homes/media/default.nix @@ -5,6 +5,7 @@ shell-conf # shell, shell utils, cli tools, libs, tui's git-conf beets + taskwarrior ]; home = { @@ -34,6 +35,17 @@ age.keyFile = "/home/media/.config/sops/age/keys.txt"; # must have no password! defaultSopsFile = ../emenel/secrets.yaml; + + secrets = { + taskchamp-id = {}; + taskchamp-key = {}; + }; + + templates."taskchamp".content = + '' +sync.server.client_id = ${config.sops.placeholder.taskchamp-id} +sync.encryption_secret = ${config.sops.placeholder.taskchamp-key} +''; }; programs = { @@ -44,6 +56,20 @@ systemd.user = { enable = true; startServices = "sd-switch"; # auto reload services when home is rebuilt + + services.taskchampion-sync-server = { + Unit = { + Description = "taskchamp"; + After = [ "network.target" ]; + }; + Install = { + WantedBy = [ "multi-user.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = "${pkgs.taskchampion-sync-server}/bin/taskchampion-sync-server --listen media-server:33043 --data-dir /home/media/.local/share/task-sync --snapshot-days 1 --snapshot-versions 30"; + }; + }; }; #custom script executables