diff --git a/_sources/generated.json b/_sources/generated.json index ad91d35..e01bd68 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "atspool": { "cargoLock": null, - "date": "2026-04-14", + "date": "2026-04-19", "extract": null, "name": "atspool", "passthru": null, @@ -32,13 +32,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "3457b34e3cd0131873b78b2e0b756ad9081075d1", - "sha256": "sha256-CYyKm6EtbnPHbdxZIMQppIjBMhkl34AyKkYNjd8mPTM=", + "rev": "e144c3cfadbb9360d06d61f5255b98eaa132e303", + "sha256": "sha256-MRT/rpHRdEz+flu7btC9HTuh65OAQBL7Gu2HxkE1q7w=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/atspool" }, - "version": "3457b34e3cd0131873b78b2e0b756ad9081075d1" + "version": "e144c3cfadbb9360d06d61f5255b98eaa132e303" }, "blog": { "cargoLock": null, @@ -226,7 +226,7 @@ }, "hydrant": { "cargoLock": null, - "date": "2026-04-18", + "date": "2026-04-20", "extract": null, "name": "hydrant", "passthru": null, @@ -236,13 +236,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "d6d967340cae71ec31f5e054dc6b9212c8e45425", - "sha256": "sha256-DYz+G6UOMHFrt/wp6jYXhnMLMonvHSsHBeotoZIPhNs=", + "rev": "db9caf450fe52a4e352abcb09af5087437fa9da5", + "sha256": "sha256-DiPNg61hAzwr9pnunD1n5hSmprfxWcIeCLtwEIuyXj0=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "d6d967340cae71ec31f5e054dc6b9212c8e45425" + "version": "db9caf450fe52a4e352abcb09af5087437fa9da5" }, "limbusart": { "cargoLock": null, @@ -387,6 +387,26 @@ }, "version": "a2b7593bf236c4268fb45e7ebe57407014fc839f" }, + "random-wisp-place": { + "cargoLock": null, + "date": "2026-04-20", + "extract": null, + "name": "random-wisp-place", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "1be6c3bde64da46d4c369135479118e62690d3d5", + "sha256": "sha256-z54L8Iks5wMbxkiD4oabTMpguXtVuq9rZizo7zRhhAY=", + "sparseCheckout": [], + "type": "git", + "url": "https://tangled.org/@ptr.pet/random.wisp.place" + }, + "version": "1be6c3bde64da46d4c369135479118e62690d3d5" + }, "stylix": { "cargoLock": null, "date": "2026-04-03", diff --git a/_sources/generated.nix b/_sources/generated.nix index b02591a..35028e0 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -20,17 +20,17 @@ }; atspool = { pname = "atspool"; - version = "3457b34e3cd0131873b78b2e0b756ad9081075d1"; + version = "e144c3cfadbb9360d06d61f5255b98eaa132e303"; src = fetchgit { url = "https://tangled.org/@ptr.pet/atspool"; - rev = "3457b34e3cd0131873b78b2e0b756ad9081075d1"; + rev = "e144c3cfadbb9360d06d61f5255b98eaa132e303"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-CYyKm6EtbnPHbdxZIMQppIjBMhkl34AyKkYNjd8mPTM="; + sha256 = "sha256-MRT/rpHRdEz+flu7btC9HTuh65OAQBL7Gu2HxkE1q7w="; }; - date = "2026-04-14"; + date = "2026-04-19"; }; blog = { pname = "blog"; @@ -152,17 +152,17 @@ }; hydrant = { pname = "hydrant"; - version = "d6d967340cae71ec31f5e054dc6b9212c8e45425"; + version = "db9caf450fe52a4e352abcb09af5087437fa9da5"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "d6d967340cae71ec31f5e054dc6b9212c8e45425"; + rev = "db9caf450fe52a4e352abcb09af5087437fa9da5"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-DYz+G6UOMHFrt/wp6jYXhnMLMonvHSsHBeotoZIPhNs="; + sha256 = "sha256-DiPNg61hAzwr9pnunD1n5hSmprfxWcIeCLtwEIuyXj0="; }; - date = "2026-04-18"; + date = "2026-04-20"; }; limbusart = { pname = "limbusart"; @@ -256,6 +256,20 @@ }; date = "2026-01-24"; }; + random-wisp-place = { + pname = "random-wisp-place"; + version = "1be6c3bde64da46d4c369135479118e62690d3d5"; + src = fetchgit { + url = "https://tangled.org/@ptr.pet/random.wisp.place"; + rev = "1be6c3bde64da46d4c369135479118e62690d3d5"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-z54L8Iks5wMbxkiD4oabTMpguXtVuq9rZizo7zRhhAY="; + }; + date = "2026-04-20"; + }; stylix = { pname = "stylix"; version = "6d0502ef7447090abf8b00362b5cda8ac64595b4"; diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 4888725..4add803 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -95,9 +95,9 @@ D( "klbr.net", REG_NONE, DnsProvider(DSP_PRIMARY), - TRIMOUNTS(["api.compare.plc"]), + TRIMOUNTS(["api.compare.plc", "api.spool"]), DZWONEK("vpn"), - VOLSINII(["plc", "relay", "hydrant"]), + VOLSINII(["plc", "relay"]), TXT("@", "data endpoint for services and projects that fall under klbr.net."), TXT( "@", @@ -107,6 +107,9 @@ D( // @ TXT("_wisp", "did:plc:ppspjougr2uxmvu6la66a35q"), A("@", "152.53.121.97"), + // hydrant + TXT("_wisp.hydrant", "did:plc:dfl62fgb7wtjj3fcbb72naae"), + CNAME("hydrant.klbr.net.", "61d703a0357bad0e.dns.wisp.place."), // spool TXT("_wisp.spool", "did:plc:ppspjougr2uxmvu6la66a35q"), CNAME("spool.klbr.net.", "903e6b98761b85f2.dns.wisp.place."), diff --git a/hosts/trimounts/modules/atspool.nix b/hosts/trimounts/modules/atspool.nix new file mode 100644 index 0000000..c8067df --- /dev/null +++ b/hosts/trimounts/modules/atspool.nix @@ -0,0 +1,10 @@ +{ + security.acme.certs."api.spool.klbr.net" = {}; + services.nginx.virtualHosts."api.spool.klbr.net" = { + useACMEHost = "api.spool.klbr.net"; + forceSSL = true; + kTLS = true; + quic = true; + locations."/".proxyPass = "http://chernobog:9889"; + }; +} diff --git a/hosts/trimounts/modules/compare-plc.nix b/hosts/trimounts/modules/compare-plc.nix index 77fc309..958f996 100644 --- a/hosts/trimounts/modules/compare-plc.nix +++ b/hosts/trimounts/modules/compare-plc.nix @@ -29,9 +29,9 @@ }; }; - security.acme.certs."klbr.net".extraDomainNames = ["api.compare.plc.klbr.net"]; + security.acme.certs."api.compare.plc.klbr.net" = {}; services.nginx.virtualHosts."api.compare.plc.klbr.net" = { - useACMEHost = "klbr.net"; + useACMEHost = "api.compare.plc.klbr.net"; forceSSL = true; quic = true; kTLS = true; diff --git a/hosts/trimounts/modules/klbr.nix/default.nix b/hosts/trimounts/modules/klbr.nix.disabled/default.nix similarity index 100% rename from hosts/trimounts/modules/klbr.nix/default.nix rename to hosts/trimounts/modules/klbr.nix.disabled/default.nix diff --git a/hosts/trimounts/modules/klbr.nix/ico.png b/hosts/trimounts/modules/klbr.nix.disabled/ico.png similarity index 100% rename from hosts/trimounts/modules/klbr.nix/ico.png rename to hosts/trimounts/modules/klbr.nix.disabled/ico.png diff --git a/hosts/trimounts/modules/klbr.nix/klbr-pets.gif b/hosts/trimounts/modules/klbr.nix.disabled/klbr-pets.gif similarity index 100% rename from hosts/trimounts/modules/klbr.nix/klbr-pets.gif rename to hosts/trimounts/modules/klbr.nix.disabled/klbr-pets.gif diff --git a/hosts/trimounts/modules/klbr.nix/printer.webp b/hosts/trimounts/modules/klbr.nix.disabled/printer.webp similarity index 100% rename from hosts/trimounts/modules/klbr.nix/printer.webp rename to hosts/trimounts/modules/klbr.nix.disabled/printer.webp diff --git a/hosts/trimounts/modules/nginx.nix b/hosts/trimounts/modules/nginx.nix index f05b507..03579df 100644 --- a/hosts/trimounts/modules/nginx.nix +++ b/hosts/trimounts/modules/nginx.nix @@ -48,7 +48,6 @@ certs."poor.dog" = { }; certs."ptr.pet" = { }; certs."gaze.systems" = { }; - certs."klbr.net" = { }; }; services.nginx.virtualHosts."gaze.systems" = { quic = true; @@ -68,12 +67,6 @@ useACMEHost = "ptr.pet"; forceSSL = true; }; - services.nginx.virtualHosts."klbr.net" = { - quic = true; - kTLS = true; - useACMEHost = "klbr.net"; - forceSSL = true; - }; services.fluent-bit.settings = { parsers = [ diff --git a/hosts/trimounts/modules/wisp-random.nix b/hosts/trimounts/modules/wisp-random.nix index 9cdb797..acacc0b 100644 --- a/hosts/trimounts/modules/wisp-random.nix +++ b/hosts/trimounts/modules/wisp-random.nix @@ -1,10 +1,6 @@ -{ pkgs, terra, ... }: +{ pkgs, terra, inputs, ... }: let - random-wisp-place = pkgs.fetchgit { - url = "https://tangled.org/did:plc:dfl62fgb7wtjj3fcbb72naae/random.wisp.place"; - rev = "refs/heads/main"; - hash = "sha256-h6yUVqVVtJOmxvf6xutP3EotIdzDGfRHnMgAEK2bnng="; - }; + random-wisp-place = inputs.random-wisp-place; port = 14553; rootDomain = "ptr.pet"; @@ -25,7 +21,7 @@ in { PORT = toString port; WISP_API_URL = "https://wisp.place"; HYDRANT_BIN = "${terra.hydrant}/bin/hydrant"; - CURSOR = "0"; + # CURSOR = "0"; }; serviceConfig = rec { diff --git a/hosts/volsinii/modules/hydrant-doc.nix b/hosts/volsinii/modules/hydrant-doc.disabled similarity index 100% rename from hosts/volsinii/modules/hydrant-doc.nix rename to hosts/volsinii/modules/hydrant-doc.disabled diff --git a/nvfetcher.toml b/nvfetcher.toml index 9e1b04c..f621a93 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -66,6 +66,9 @@ fetch.git = "https://tangled.org/@ptr.pet/hydrant" src.git = "https://tangled.org/@ptr.pet/compare-plc" fetch.git = "https://tangled.org/@ptr.pet/compare-plc" +[random-wisp-place] +src.git = "https://tangled.org/@ptr.pet/random.wisp.place" +fetch.git = "https://tangled.org/@ptr.pet/random.wisp.place" ## TANGLED ## diff --git a/secrets/atspool.age b/secrets/atspool.age new file mode 100644 index 0000000000000000000000000000000000000000..d418e4004e85353eb3290f0ac4e6227e77e5c63f GIT binary patch literal 860 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!*`Do#{zOv)`wOy|li)^^K`vPk#z z$*J-)F)r0N@^B3EFw@SD$}4ks%gN3$PBk#{)-UwRFb(%H2@7#C$W6`*3y28F*7plZ zHYn!GDD?Mmb1CunEAg=mbdSt&4h;^>EGx`(aV)GXsw}ZEt}yj5@Q*C;(suT9wFoiF z$u3F?3M)-6bq_H&@^dQXa?5bb3Nbcusd5UbFm}(g%qy=<^(x3n%(Ki%b_;QFO-l^( zNDuc3Eevt@2s7|X4a{^2&otIg40H1@tJ2PL<#I|X2uKe$s&vZoElkQQ_A*P03=DEK zGpkDR2&pL35BD_)Pf9L!%TISVDf29<2n#6=5BIVtDXg&2_A{>XH{|jOsS2_*PfT?T z2umw03<~f!E%FaDOiB;;$_%Y?H!Sza@vq7a&h!m%bMo{E$u~^#&&Uc$4z?`I2==!$ zaZ2OLEG;rgGj~k!b`Q=-4s%TMD-6!|^YXPYc8^LAvM4DucP=URDJrX~Fi$ND&-ZkR zD71_S%*)C1O>yXhPR+?Ts>rtpN>9r6<|;KQPw_1ca>>bXHBQQNDk><6v?#79 z_BTv5PcksdOf^mlPjpW43M_TYNeayiat=!lN^{XJNeNBz3Nm&M$l=QO49ap2a0)cZ zFG?=4G;plU@ieb+HF1mZ3Mfy`v@|jePckViE(xkiEJ}2D%q=bPDs(A#HZUo#EKCkG zDz4)4FfNEHjx4Ik_K6D3b1XFWb~D#EaV-l^@pcRK4i9m6%{0}{^{;XaaWgK>%nHj1 z4XyHV)h^1<^Ky$!FYylJa&s&%G!51Fb#^kUNG+{&c8Lr~aZj_1)Gqc3@=gmYE7o=` zF$xS0aCI){($&>faCFTGbaTrL3^7bGOiIzO)OQbXbq(<;GVu$}G7mN_OEb@pjLa@f z$;l4oIy?XNrpg=NzU@%hbvbKE=fCq!=Wmt@WMp3bDw1Sjo+fV|buoN%Y~WI@jh_Vi ojva_&2yHqPEKpS+vgr2dt*^aKTK`j0dm(yzL-L!b>3>fG0LQ{EjQ{`u literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 333e19c..179320c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -35,4 +35,5 @@ in "callieMusic.age".publicKeys = [yusdacra trimounts]; "atloginCfg.age".publicKeys = [yusdacra trimounts]; "navidrome.age".publicKeys = [yusdacra trimounts]; + "atspool.age".publicKeys = [yusdacra]; } diff --git a/users/modules/atspool/default.nix b/users/modules/atspool/default.nix index a8b016a..efcfefc 100644 --- a/users/modules/atspool/default.nix +++ b/users/modules/atspool/default.nix @@ -1,11 +1,13 @@ -{ terra, ... }: +{ config, terra, ... }: { + age.secrets.atspool.file = ../../../secrets/atspool.age; systemd.user.services.atspool = { Install = { WantedBy = [ "default.target" ]; }; Service = { ExecStart = "${terra.atspool}/bin/atspool"; + EnvironmentFile = config.age.secrets.atspool.path; Restart = "on-failure"; RestartSec = 5; WorkingDirectory = "%h/.config/atspool";