From 974b42d6712124d911657736f5308df03391a020 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 3 Apr 2025 11:18:12 -0400 Subject: [PATCH] taskwarrior web server --- flake.lock | 48 ++++++++++++++-------------- homes/media/default.nix | 5 +-- hosts/media-server/configuration.nix | 12 +++++++ modules/home/taskwarrior-web.nix | 23 +++++++++++++ modules/system/taskwarrior-web.nix | 7 ++++ result | 1 - 6 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 modules/home/taskwarrior-web.nix create mode 100644 modules/system/taskwarrior-web.nix delete mode 120000 result diff --git a/flake.lock b/flake.lock index 446b3d7..5feb0af 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1743614257, - "narHash": "sha256-Twr8RN+jwMtZjbR5DnU1LpsD1AFbkZtoBGRDpPD6isc=", + "lastModified": 1743673353, + "narHash": "sha256-fGUL1CcVQnG233pr43D+RHqo1kWYdFFYcZuxhUJh/cA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "513da799bd6dc36b9ee69db71f102257dab665e6", + "rev": "4f1f635f5ae1bc6a77ae7ca20a2699439dd53647", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1743607567, - "narHash": "sha256-kTzKPDFmNzwO1cK4fiJgPB/iSw7HgBAmknRTeAPJAeI=", + "lastModified": 1743648554, + "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49748c74cdbae03d70381f150b810f92617f23aa", + "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", "type": "github" }, "original": { @@ -719,11 +719,11 @@ ] }, "locked": { - "lastModified": 1742933628, - "narHash": "sha256-Qe/XUKvcaNdQflvhQQSX1PV5SjNx/RCBBDHxbWxE2xI=", + "lastModified": 1743682999, + "narHash": "sha256-bg+aAN8K90r3m/I+xXiXG0gawpbkshwlk93wxUN7KEk=", "owner": "viperML", "repo": "nh", - "rev": "7bd0d00a3f1aab85a7e29d34b4f1f6744263e6c3", + "rev": "9e9a4590b38b62b28f07a1fae973ce7b6ca0687a", "type": "github" }, "original": { @@ -744,11 +744,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743563355, - "narHash": "sha256-CfKmrac0Ru5yiCFRGhzyJ6P/ynFlMCsEBnMn+nKdxLs=", + "lastModified": 1743644801, + "narHash": "sha256-z8x/j/RuDBo/5lNt3XYatKRpIMFMHVE2HK7TKVxYn+c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "829f6a4eef6081fbd28bdc3351e1a6915047fba9", + "rev": "f3fca85fe72c70d58f44f4c6ad2f27a91aa54d0d", "type": "github" }, "original": { @@ -965,11 +965,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743501102, - "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { @@ -981,11 +981,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1743501102, - "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1743501102, - "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743344227, - "narHash": "sha256-Lp1JUMrhvAmCzftOSQ2Sr0+svemxSxcLeZ4HkmdLXbE=", + "lastModified": 1743669585, + "narHash": "sha256-uAOZg2vsMooemIpV0jdgy7JicuVNBbJl2gRN7m/N0ZM=", "owner": "sxyazi", "repo": "yazi", - "rev": "1765aba68440f73c590cedac14ece6778fe88ff5", + "rev": "b725b86be13ffc127094dbb981d667d3d7d8c64a", "type": "github" }, "original": { diff --git a/homes/media/default.nix b/homes/media/default.nix index 368a921..cc17013 100644 --- a/homes/media/default.nix +++ b/homes/media/default.nix @@ -6,6 +6,7 @@ git-conf beets taskwarrior + taskwarrior-web ]; home = { @@ -77,8 +78,4 @@ sync.encryption_secret = ${config.sops.placeholder.taskchamp-key} source = ../emenel/dotfiles/dot_local/bin; recursive = true; }; - - home.file.".local/bin/tww" = { - source = ../../modules/home/tww; - }; } diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix index 975a7d4..2ad21b7 100644 --- a/hosts/media-server/configuration.nix +++ b/hosts/media-server/configuration.nix @@ -190,6 +190,18 @@ services.tailscale.enable = true; systemd.services.tailscaled.after = [ "NetworkManager-wait-online.service" ]; + services.caddy = { + enable = true; + virtualHosts = { + "tw.media-server".extraConfig = '' +reverse_proxy http://localhost:3000 { + header_down X-Real-IP {http.request.remote} + header_down X-Forwarded-For {http.request.remote} +} +''; + }; + }; + nixarr = { enable = true; diff --git a/modules/home/taskwarrior-web.nix b/modules/home/taskwarrior-web.nix new file mode 100644 index 0000000..5e95ae8 --- /dev/null +++ b/modules/home/taskwarrior-web.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: + +{ + + systemd.user.services.taskwarrior-web = { + Unit = { + Description = "taskwarrior web"; + After = [ "network.target" ]; + }; + Install = { + WantedBy = [ "multi-user.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = "/home/media/.local/bin/tww/taskwarrior-web"; + Restart = "always"; + }; + }; + + home.file.".local/bin/tww" = { + source = ../../modules/home/tww; + }; +} diff --git a/modules/system/taskwarrior-web.nix b/modules/system/taskwarrior-web.nix new file mode 100644 index 0000000..ef6641e --- /dev/null +++ b/modules/system/taskwarrior-web.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + + # make reverse proxy web server for taskwarrior web + +} diff --git a/result b/result deleted file mode 120000 index d181816..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/64k46yhc7x77z100km28q7xvxk8xcvc0-taskwarrior-web-2025-04-01 \ No newline at end of file