diff --git a/_sources/generated.json b/_sources/generated.json index a1a4899..ad91d35 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -100,6 +100,26 @@ }, "version": "a60247a8d92e1802298fc197034d0b7b54cd90b7" }, + "compare-plc": { + "cargoLock": null, + "date": "2026-04-19", + "extract": null, + "name": "compare-plc", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "ffdc2ac48839352630ef3fdbeb1053ee53f0fb6e", + "sha256": "sha256-yCO8prigt/88IZoBejIbmsqlR6cVfpZPfMy4aHbvG2s=", + "sparseCheckout": [], + "type": "git", + "url": "https://tangled.org/@ptr.pet/compare-plc" + }, + "version": "ffdc2ac48839352630ef3fdbeb1053ee53f0fb6e" + }, "disko": { "cargoLock": null, "date": "2026-03-19", @@ -206,7 +226,7 @@ }, "hydrant": { "cargoLock": null, - "date": "2026-04-15", + "date": "2026-04-18", "extract": null, "name": "hydrant", "passthru": null, @@ -216,13 +236,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "73c0f00899788fce68908d81a1faadb2b47d2517", - "sha256": "sha256-auipRcz8kEtG38g77IATavm/wZWvinsGIDhouwJYA8c=", + "rev": "d6d967340cae71ec31f5e054dc6b9212c8e45425", + "sha256": "sha256-DYz+G6UOMHFrt/wp6jYXhnMLMonvHSsHBeotoZIPhNs=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "73c0f00899788fce68908d81a1faadb2b47d2517" + "version": "d6d967340cae71ec31f5e054dc6b9212c8e45425" }, "limbusart": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index d11aa78..b02591a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -74,6 +74,20 @@ }; date = "2025-09-15"; }; + compare-plc = { + pname = "compare-plc"; + version = "ffdc2ac48839352630ef3fdbeb1053ee53f0fb6e"; + src = fetchgit { + url = "https://tangled.org/@ptr.pet/compare-plc"; + rev = "ffdc2ac48839352630ef3fdbeb1053ee53f0fb6e"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-yCO8prigt/88IZoBejIbmsqlR6cVfpZPfMy4aHbvG2s="; + }; + date = "2026-04-19"; + }; disko = { pname = "disko"; version = "5ad85c82cc52264f4beddc934ba57f3789f28347"; @@ -138,17 +152,17 @@ }; hydrant = { pname = "hydrant"; - version = "73c0f00899788fce68908d81a1faadb2b47d2517"; + version = "d6d967340cae71ec31f5e054dc6b9212c8e45425"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "73c0f00899788fce68908d81a1faadb2b47d2517"; + rev = "d6d967340cae71ec31f5e054dc6b9212c8e45425"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-auipRcz8kEtG38g77IATavm/wZWvinsGIDhouwJYA8c="; + sha256 = "sha256-DYz+G6UOMHFrt/wp6jYXhnMLMonvHSsHBeotoZIPhNs="; }; - date = "2026-04-15"; + date = "2026-04-18"; }; limbusart = { pname = "limbusart"; diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index d90f8cd..4888725 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -95,7 +95,7 @@ D( "klbr.net", REG_NONE, DnsProvider(DSP_PRIMARY), - TRIMOUNTS(["@", "spool"]), + TRIMOUNTS(["api.compare.plc"]), DZWONEK("vpn"), VOLSINII(["plc", "relay", "hydrant"]), TXT("@", "data endpoint for services and projects that fall under klbr.net."), @@ -104,6 +104,15 @@ D( "try connecting to https://klbr.net for more information.", ), TXT("_atproto", "did=did:plc:ppspjougr2uxmvu6la66a35q", TTL(60)), + // @ + TXT("_wisp", "did:plc:ppspjougr2uxmvu6la66a35q"), + A("@", "152.53.121.97"), + // spool + TXT("_wisp.spool", "did:plc:ppspjougr2uxmvu6la66a35q"), + CNAME("spool.klbr.net.", "903e6b98761b85f2.dns.wisp.place."), + // compare plc + TXT("_wisp.compare.plc", "did:plc:dfl62fgb7wtjj3fcbb72naae"), + CNAME("compare.plc.klbr.net.", "9602ca6bb742000c.dns.wisp.place."), // fastmail CNAME("fm1._domainkey", "fm1.klbr.net.dkim.fmhosted.com."), CNAME("fm2._domainkey", "fm2.klbr.net.dkim.fmhosted.com."), diff --git a/hosts/trimounts/modules/compare-plc.nix b/hosts/trimounts/modules/compare-plc.nix new file mode 100644 index 0000000..77fc309 --- /dev/null +++ b/hosts/trimounts/modules/compare-plc.nix @@ -0,0 +1,40 @@ +{pkgs, inputs, ...}: +{ + users.users.compare-plc = { + isSystemUser = true; + group = "compare-plc"; + home = "/var/lib/compare-plc"; + createHome = true; + }; + users.groups.compare-plc = {}; + + systemd.services.compare-plc = { + description = "compare-plc"; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.bun}/bin/bun ${inputs.compare-plc}/server.ts"; + Restart = "on-failure"; + RestartSec = "10s"; + StateDirectory = "compare-plc"; + WorkingDirectory = "/var/lib/compare-plc"; + User = "compare-plc"; + Group = "compare-plc"; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = true; + ReadWritePaths = ["/var/lib/compare-plc"]; + }; + }; + + security.acme.certs."klbr.net".extraDomainNames = ["api.compare.plc.klbr.net"]; + services.nginx.virtualHosts."api.compare.plc.klbr.net" = { + useACMEHost = "klbr.net"; + forceSSL = true; + quic = true; + kTLS = true; + locations."/".proxyPass = "http://127.0.0.1:7331"; + }; +} \ No newline at end of file diff --git a/hosts/volsinii/modules/plc.nix b/hosts/volsinii/modules/plc.nix index 1bfcb8d..465cf68 100644 --- a/hosts/volsinii/modules/plc.nix +++ b/hosts/volsinii/modules/plc.nix @@ -25,6 +25,7 @@ description = "allegedly mirror service"; after = ["network.target"]; wantedBy = ["multi-user.target"]; + environment = { RUST_LOG="allegedly=debug"; }; serviceConfig = { Type = "simple"; WorkingDirectory = "/root/allegedly2"; diff --git a/hosts/volsinii/modules/relay.nix b/hosts/volsinii/modules/relay.nix index f44bc69..debdffe 100644 --- a/hosts/volsinii/modules/relay.nix +++ b/hosts/volsinii/modules/relay.nix @@ -22,7 +22,8 @@ in environment = { HYDRANT_API_PORT = port; HYDRANT_CURSOR_SAVE_INTERVAL = "1"; - HYDRANT_PLC_URL = "http://localhost:8000"; + HYDRANT_SEED_HOSTS= "https://bsky.network,https://relay.bas.sh"; + 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 ea847b3..9e1b04c 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,5 +1,3 @@ -# nvfetcher configuration for Nix flake inputs - [facter] src.git = "https://github.com/nix-community/nixos-facter-modules" fetch.github = "nix-community/nixos-facter-modules" @@ -64,6 +62,11 @@ fetch.git = "https://tangled.org/@ptr.pet/dysnomia" src.git = "https://tangled.org/@ptr.pet/hydrant" fetch.git = "https://tangled.org/@ptr.pet/hydrant" +[compare-plc] +src.git = "https://tangled.org/@ptr.pet/compare-plc" +fetch.git = "https://tangled.org/@ptr.pet/compare-plc" + + ## TANGLED ## [tangled] diff --git a/pkgs-set/pkgs/antigravity.nix/information.json b/pkgs-set/pkgs/antigravity.nix/information.json index a18415f..79cbe4f 100644 --- a/pkgs-set/pkgs/antigravity.nix/information.json +++ b/pkgs-set/pkgs/antigravity.nix/information.json @@ -1,22 +1,22 @@ { - "version": "1.20.5", + "version": "1.23.2", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-x64/Antigravity.tar.gz", - "sha256": "5b87664f454da487b8dee87aaf5e3361d9ba79b947770b798bd0fa874a9827e5" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz", + "sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-arm/Antigravity.tar.gz", - "sha256": "26fc65c4b538470ed1198f3d0ad855d1e4d81a9bfcbc607816b74de35999dbbf" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", + "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-x64/Antigravity.zip", - "sha256": "54fdcf8eac2eab176b04e587a5679d2993701fe4e5788e79f25c7ced2de605ef" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", + "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-arm/Antigravity.zip", - "sha256": "d3e6e75299062720a3300634305f2030ab8fcb4efb5ce8642305a576554caaca" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", + "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" } } } diff --git a/pkgs-set/pkgs/lmstudio.nix/default.nix b/pkgs-set/pkgs/lmstudio.nix/default.nix index b9e84b2..c69e212 100644 --- a/pkgs-set/pkgs/lmstudio.nix/default.nix +++ b/pkgs-set/pkgs/lmstudio.nix/default.nix @@ -11,8 +11,8 @@ let hash_aarch64-linux = "sha256-fQgXmhkbqTjbW/pyPvyZsIxtkQanpgh1DkzyrbFH6t8="; version_aarch64-darwin = "0.4.9-1"; hash_aarch64-darwin = "sha256-MuvYJ5mVC6Usz37DF/TG4M8gOHsKG2uN9qzq+dXNa7M="; - version_x86_64-linux = "0.4.11-1"; - hash_x86_64-linux = "sha256-l/WVuU+1muv2HOnOHy2h6/FXibiZpj3nMzGoLFTqZFc="; + version_x86_64-linux = "0.4.12-1"; + hash_x86_64-linux = "sha256-U7TJkMUqmL4Wk77zcIN2/4IFz7artvVg0saREjoGy8I="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";