From 99ede6a67a16b78c8cd99b8ed386b49cdbdf9e94 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 18 Aug 2026 09:57:25 +0200 Subject: [PATCH] Tora vpn work --- .gitignore | 7 +++++++ .pre-commit-config.yaml | 2 +- backlog.md | 9 +++++++-- devenv.lock | 30 +++++++++++++++--------------- devenv.nix | 5 ++++- justfile | 6 ++++-- 6 files changed, 38 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7121dd9..4cae10d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ config.yaml /server /vendor pkg/metadatapb/ +.claude/* +.codegraph/* +.omo/* # Ignore all * @@ -50,3 +53,7 @@ dev/ # Added by cargo /target + + +data/* + diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 85cb9ac..aabf9d7 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/89dh2k01lvb3lsmnyja13324p9x3fkih-pre-commit-config.json \ No newline at end of file +/nix/store/rh5id2b2rs7200wyvlfl5pgh8ba4i5nq-pre-commit-config.json \ No newline at end of file diff --git a/backlog.md b/backlog.md index c9b47e2..adf9f89 100644 --- a/backlog.md +++ b/backlog.md @@ -6,7 +6,9 @@ - [ ] [P2] Every restart of devenv - recreates Jackett container *(priority: P2)* - [ ] [P2] Implement reconnection on service restart *(priority: P2)* -- [ ] [P2] Update devenv services to properly show ready state similarly to postgres *(priority: P2)* +- [x] [P2] Update devenv services to properly show ready state similarly to postgres *(priority: P2, progress: 100)* +- [x] [P1] Implement Monitor Album *(progress: 100)* +- [ ] [P2] Implement download source, for example autodownload songs from youtube *(priority: P2)* @@ -14,10 +16,13 @@ | Timestamp | Item ID | Action | Details | |-----------|---------|--------|---------| +| 2026-08-17T20:06:49.708Z | n-rzxtwn | item_created | Implement download source, for example autodownload songs from youtube | +| 2026-07-25T10:47:17.547Z | n-2upxei | item_created | Implement Monitor Album | +| 2026-07-25T10:43:53.501Z | i-ms07jr3l | status_changed | open → done | | 2026-07-22T20:48:17.097Z | n-zlin24 | item_created | Update devenv services to properly show ready state similarly to postgres | | 2026-07-20T10:27:43.739Z | n-wynn47 | item_created | Implement reconnection on service restart | | 2026-07-19T12:57:24.051Z | n-ddy1wp | item_created | Every restart of devenv - recreates Jackett container | - + diff --git a/devenv.lock b/devenv.lock index 26160f2..293bf6e 100644 --- a/devenv.lock +++ b/devenv.lock @@ -83,11 +83,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1784644044, - "narHash": "sha256-U2kO/QOuW117JIctgK0Hq9b3+5quEDB1fxiIXqhX6OI=", + "lastModified": 1787015266, + "narHash": "sha256-B4eXU1+QiZc3fFgH0pTl185xNUYNzW+1KIe9Jmtavkk=", "owner": "cachix", "repo": "devenv", - "rev": "87c0b55cf635e41d0ba2d418d01189c9abf7a75d", + "rev": "c18de5253016e6eb97689724327f08e9dd2d4768", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "nixpkgs-src": { "flake": false, "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1786858016, + "narHash": "sha256-Vczr2zxD0orq6N2QQe5uqOGF7TRDcQJRRuAcsdHr4kg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "54ba4bcec4043e72a4006d825e0d7aff5562008f", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "nixpkgs-src": "nixpkgs-src" }, "locked": { - "lastModified": 1783345554, - "narHash": "sha256-LZhOm4kqjHUnwP4CNHpaqqEVcumGNd1PvOEOad8LkS0=", + "lastModified": 1787002832, + "narHash": "sha256-DGkHh88/7YLVGZ7HzSVN4YmUmR+wGKudIp6H9UsUNT0=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "6004ea8c229fe9d41b21c6f4c76bf6c2e10771dd", + "rev": "ee3d58d53cfcddfc0ae6fc7f04f4fe2a0c7cf0ed", "type": "github" }, "original": { @@ -392,11 +392,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1784532650, - "narHash": "sha256-50kpr8hJKmsd6J+0KKS1WRXp1JRw9nLDHFA4fi/QQ6o=", + "lastModified": 1787028847, + "narHash": "sha256-R/0D4Cs8gzhtRyT4fqiK41AfM2DTMGNeTcdcyaLyhRQ=", "owner": "lukasl-dev", "repo": "pi.nix", - "rev": "1ee5a66c7ae8b33051b90aa92016d976dfbb729c", + "rev": "273a55220a90e4c50fbfcd88e6b432796fba0e58", "type": "github" }, "original": { @@ -485,11 +485,11 @@ ] }, "locked": { - "lastModified": 1784369104, - "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { diff --git a/devenv.nix b/devenv.nix index df88a7f..a3940d3 100644 --- a/devenv.nix +++ b/devenv.nix @@ -63,12 +63,15 @@ # torrents to dev/downloads/completed// on completion. # musicfs scans only the completed/ subtree so it never sees partially # written files. + # $TORAD_ARGS is unquoted on purpose: it word-splits, so any torad flag can be + # passed through without editing this file (see `just up` in the justfile). processes.torad.exec = lib.mkForce '' mkdir -p "$PWD/dev/downloads" ${config.outputs.torad}/bin/torad \ --socket "$TORAD_SOCKET" \ --pid-file "$TORAD_PID_FILE" \ - --download-dir "$PWD/dev/downloads" + --download-dir "$PWD/dev/downloads" \ + $TORAD_ARGS ''; processes.musicfs.exec = lib.mkForce '' diff --git a/justfile b/justfile index 84d4465..b3d9a43 100644 --- a/justfile +++ b/justfile @@ -7,5 +7,7 @@ build: proto run *FLAGS: proto cargo run -- {{FLAGS}} -up: - devenv up +# Extra flags are passed to torad, e.g. +# just up --wireguard-config data/wg.conf +up *FLAGS: + TORAD_ARGS="{{FLAGS}}" devenv up