From 1d2fade50ce1ed77702afe72fc3ad30e7436d8b3 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 3 Apr 2025 13:38:45 -0400 Subject: [PATCH] cleanup --- homes/emenel/default.nix | 4 +++- homes/media/default.nix | 16 +------------ hosts/media-server/configuration.nix | 24 ++++++++++---------- modules/home/taskwarrior.nix | 14 ++++++++++++ packages/tasklite.nix | 34 ++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 packages/tasklite.nix diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index baf29b8..370268d 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -10,7 +10,7 @@ music langs emacs - taskwarrior + # taskwarrior ]; home = { @@ -21,6 +21,8 @@ designer ]) + [ nix-config.packages.x86_64-linux.tasklite ] + (with pkgs; [ dconf cifs-utils diff --git a/homes/media/default.nix b/homes/media/default.nix index 5d53adb..eab1bb6 100644 --- a/homes/media/default.nix +++ b/homes/media/default.nix @@ -6,7 +6,7 @@ git-conf beets taskwarrior - taskwarrior-web + # taskwarrior-web ]; home = { @@ -58,20 +58,6 @@ sync.encryption_secret = ${config.sops.placeholder.taskchamp-key} 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 diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix index 055e5f5..4d17a37 100644 --- a/hosts/media-server/configuration.nix +++ b/hosts/media-server/configuration.nix @@ -81,7 +81,7 @@ curl cifs-utils caddy - taskchampion-sync-server + # taskchampion-sync-server ]; fonts = { @@ -190,17 +190,17 @@ services.tailscale.enable = true; systemd.services.tailscaled.after = [ "NetworkManager-wait-online.service" ]; - services.caddy = { - enable = true; - virtualHosts = { - "media-server" = { - serverAliases = [ "media-server" "media-server.local" ]; - extraConfig = '' -reverse_proxy localhost:3000 -''; - }; - }; - }; +# services.caddy = { +# enable = true; +# virtualHosts = { +# "media-server" = { +# serverAliases = [ "media-server" "media-server.local" ]; +# extraConfig = '' +# reverse_proxy localhost:3000 +# ''; +# }; +# }; +# }; nixarr = { enable = true; diff --git a/modules/home/taskwarrior.nix b/modules/home/taskwarrior.nix index b815b29..556be8c 100644 --- a/modules/home/taskwarrior.nix +++ b/modules/home/taskwarrior.nix @@ -34,4 +34,18 @@ source = ./taskwarrior/hooks; recursive = true; }; + + # 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"; + # }; + # }; } diff --git a/packages/tasklite.nix b/packages/tasklite.nix new file mode 100644 index 0000000..5ce6dbe --- /dev/null +++ b/packages/tasklite.nix @@ -0,0 +1,34 @@ +{ stdenv, pkgs, unzip, autoPatchelfHook, fetchurl, lib, ... }: + +stdenv.mkDerivation { + pname = "tasklite"; + version = "ci"; + + src = fetchurl { + url = "https://productionresultssa18.blob.core.windows.net/actions-results/3145698a-7fd9-415c-99d6-d74d4dfc1a7a/workflow-job-run-015d34fc-67a3-589c-a72e-541495a912de/artifacts/653fbd898f6c68fd4665912e4d0b14e295fe658fbdd60da07ab9cd8ac0793d65.zip?rscd=attachment%3B+filename%3D%22tasklite_linux_x86_64.zip%22&se=2025-04-03T17%3A06%3A50Z&sig=CVkJI8x6BFh1D2dRJZVAeqUeQ26%2BQpE0VYBfslOYrGM%3D&ske=2025-04-04T04%3A23%3A10Z&skoid=ca7593d4-ee42-46cd-af88-8b886a2f84eb&sks=b&skt=2025-04-03T16%3A23%3A10Z&sktid=398a6654-997b-47e9-b12b-9515b896b4de&skv=2025-01-05&sp=r&spr=https&sr=b&st=2025-04-03T16%3A56%3A45Z&sv=2025-01-05"; + sha256 = "2b8c98d8adbc56ebccf17f175a52e6633c16562924ef2bdca62a21a273f0051a"; + }; + + nativeBuildInputs = [ unzip autoPatchelfHook ]; + + buildInputs = with pkgs; [ + libz + gmp + stdenv + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/bin + cp tasklite $out/bin + ''; + + meta = with lib; { + homepage = ""; + description = ""; + platforms = platforms.linux; + }; +}