From 25abe6a372379af0045e51ab044ede2aaae9765f Mon Sep 17 00:00:00 2001 From: dawn <90008@gaze.systems> Date: Thu, 21 May 2026 00:21:09 +0300 Subject: [PATCH] bobbins --- .gitignore | 1 + _sources/generated.json | 30 +++++++++++++++++++++++++----- _sources/generated.nix | 24 +++++++++++++++++++----- hosts/volsinii/modules/bobbin.nix | 15 ++++++++++++++- hosts/volsinii/modules/relay.nix | 4 ++-- nvfetcher.toml | 8 ++++++-- pkgs-set/pkgs/bobbin.nix | 11 +++-------- 7 files changed, 70 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 7696f33..c304648 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ creds.json # deploy resources .hetzner +AGENTS.md \ No newline at end of file diff --git a/_sources/generated.json b/_sources/generated.json index ca87527..de9ec05 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -60,6 +60,26 @@ }, "version": "9a31eccc91322536b4278f5b037f3c78e184abb3" }, + "bobbin": { + "cargoLock": null, + "date": "2026-05-20", + "extract": null, + "name": "bobbin", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "692b862ff683ff7689006549883f0a360b1ff80a", + "sha256": "sha256-EJpsS1Hn1g03ewLToIlOONcCvsf8pmsrQtiEhNp7DvM=", + "sparseCheckout": [], + "type": "git", + "url": "https://tangled.org/oyster.cafe/bobbin" + }, + "version": "692b862ff683ff7689006549883f0a360b1ff80a" + }, "clickee": { "cargoLock": null, "date": "2025-09-14", @@ -143,7 +163,7 @@ }, "drop": { "cargoLock": null, - "date": "2026-05-19", + "date": "2026-05-20", "extract": null, "name": "drop", "passthru": null, @@ -153,13 +173,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "b184c0e959acb960f9b9500babf85abe94080f10", - "sha256": "sha256-00084BVoJb6Jp3kFbt/iAuK7Vs5RLigZD+KwmWkUx98=", + "rev": "f85215b1674c55d6885f55b6b2a9e1174a2e9313", + "sha256": "sha256-TUDehZwQIVy0NQvZxYnhXaG28dJesie1u9yFG53tUkg=", "sparseCheckout": [], "type": "git", - "url": "https://tangled.org/ptr.pet/drop" + "url": "https://tangled.org/juliet.paris/drop" }, - "version": "b184c0e959acb960f9b9500babf85abe94080f10" + "version": "f85215b1674c55d6885f55b6b2a9e1174a2e9313" }, "dysnomia": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 354c858..3ea94e1 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -46,6 +46,20 @@ }; date = "2026-04-24"; }; + bobbin = { + pname = "bobbin"; + version = "692b862ff683ff7689006549883f0a360b1ff80a"; + src = fetchgit { + url = "https://tangled.org/oyster.cafe/bobbin"; + rev = "692b862ff683ff7689006549883f0a360b1ff80a"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-EJpsS1Hn1g03ewLToIlOONcCvsf8pmsrQtiEhNp7DvM="; + }; + date = "2026-05-20"; + }; clickee = { pname = "clickee"; version = "ca379a35ac60cc80fa4bf68a27ee0c30724ad324"; @@ -102,17 +116,17 @@ }; drop = { pname = "drop"; - version = "b184c0e959acb960f9b9500babf85abe94080f10"; + version = "f85215b1674c55d6885f55b6b2a9e1174a2e9313"; src = fetchgit { - url = "https://tangled.org/ptr.pet/drop"; - rev = "b184c0e959acb960f9b9500babf85abe94080f10"; + url = "https://tangled.org/juliet.paris/drop"; + rev = "f85215b1674c55d6885f55b6b2a9e1174a2e9313"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-00084BVoJb6Jp3kFbt/iAuK7Vs5RLigZD+KwmWkUx98="; + sha256 = "sha256-TUDehZwQIVy0NQvZxYnhXaG28dJesie1u9yFG53tUkg="; }; - date = "2026-05-19"; + date = "2026-05-20"; }; dysnomia = { pname = "dysnomia"; diff --git a/hosts/volsinii/modules/bobbin.nix b/hosts/volsinii/modules/bobbin.nix index 8f05557..cea50c7 100644 --- a/hosts/volsinii/modules/bobbin.nix +++ b/hosts/volsinii/modules/bobbin.nix @@ -41,8 +41,9 @@ in ]; environment = { HYDRANT_API_BIND = "127.0.0.1:${toString hydrantPort}"; - HYDRANT_PLC_URL = "http://127.0.0.1:8000"; + # HYDRANT_PLC_URL = "http://127.0.0.1:8000"; HYDRANT_RELAY_HOSTS = "http://127.0.0.1:13579"; + HYDRANT_PLC_URL = "https://plc.directory"; HYDRANT_FILTER_SIGNALS = "sh.tangled.actor.profile,sh.tangled.feed.reaction,sh.tangled.feed.star,sh.tangled.git.refUpdate,sh.tangled.graph.follow,sh.tangled.graph.vouch,sh.tangled.knot,sh.tangled.knot.member,sh.tangled.label.definition,sh.tangled.label.op,sh.tangled.pipeline,sh.tangled.pipeline.status,sh.tangled.publicKey,sh.tangled.repo,sh.tangled.repo.artifact,sh.tangled.repo.collaborator,sh.tangled.repo.issue,sh.tangled.repo.issue.comment,sh.tangled.repo.issue.state,sh.tangled.repo.pull,sh.tangled.repo.pull.comment,sh.tangled.repo.pull.status,sh.tangled.spindle,sh.tangled.spindle.member,sh.tangled.string"; HYDRANT_FILTER_COLLECTIONS = "sh.tangled.*"; HYDRANT_VERIFY_SIGNATURES = "none"; @@ -115,6 +116,18 @@ in locations."/" = { proxyPass = "http://127.0.0.1:${toString bobbinPort}"; proxyWebsockets = true; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Content-Type' always; + + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Max-Age' 86400; + add_header 'Content-Type' 'text/plain; charset=utf-8'; + add_header 'Content-Length' 0; + return 204; + } + ''; }; }; } diff --git a/hosts/volsinii/modules/relay.nix b/hosts/volsinii/modules/relay.nix index cc0c662..6872ac7 100644 --- a/hosts/volsinii/modules/relay.nix +++ b/hosts/volsinii/modules/relay.nix @@ -22,8 +22,8 @@ in environment = { HYDRANT_API_BIND = "0.0.0.0:${port},[::]:${port}"; HYDRANT_CURSOR_SAVE_INTERVAL = "1sec"; - HYDRANT_SEED_HOSTS = "https://bsky.network,https://relay.bas.sh"; - HYDRANT_PLC_URL = "http://127.0.0.1:8000"; + HYDRANT_SEED_HOSTS = "https://relay.bas.sh,https://bsky.network"; + HYDRANT_PLC_URL = "https://plc.directory"; HYDRANT_DATA_COMPRESSION = "zstd"; HYDRANT_JOURNAL_COMPRESSION = "zstd"; HYDRANT_RATE_TIERS = "default:5000/10.0/18000000/432000000/10000000"; diff --git a/nvfetcher.toml b/nvfetcher.toml index 0373e4f..0fbc9e1 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -75,8 +75,12 @@ src.git = "https://tangled.org/@ptr.pet/slopview" fetch.git = "https://tangled.org/@ptr.pet/slopview" [drop] -src.git = "https://tangled.org/ptr.pet/drop" -fetch.git = "https://tangled.org/ptr.pet/drop" +src.git = "https://tangled.org/juliet.paris/drop" +fetch.git = "https://tangled.org/juliet.paris/drop" + +[bobbin] +src.git = "https://tangled.org/oyster.cafe/bobbin" +fetch.git = "https://tangled.org/oyster.cafe/bobbin" ## TANGLED ## diff --git a/pkgs-set/pkgs/bobbin.nix b/pkgs-set/pkgs/bobbin.nix index 7ef7a2f..229ec44 100644 --- a/pkgs-set/pkgs/bobbin.nix +++ b/pkgs-set/pkgs/bobbin.nix @@ -2,19 +2,14 @@ lib, inputs, rustPlatform, - fetchzip, ... }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "bobbin"; - version = "05df522f1fd2babc3540e2652c6ed348221612dd"; + version = "main"; - src = fetchzip { - url = "https://tangled.org/oyster.cafe/bobbin/archive/${version}.tar.gz"; - hash = "sha256-ly9q9gVXfzvl1FRhGYFK7XYkybUdH4PLccqHqXQwcHk="; - stripRoot = false; - }; + src = inputs.bobbin; cargoHash = "sha256-Ojy5LZvyM3J+0zwMn96G/K2XXpj5ASM7ho5Y3Xj8Apg="; -- 2.51.2