diff --git a/_sources/generated.json b/_sources/generated.json index cf82eb6..626596b 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -186,7 +186,7 @@ }, "hydrant": { "cargoLock": null, - "date": "2026-03-06", + "date": "2026-03-11", "extract": null, "name": "hydrant", "passthru": null, @@ -196,13 +196,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "ec63e739fc3ee88102090d557558d1e5b048b255", - "sha256": "sha256-0EEEn9F1zdTlDSEwCnkPCANBiEV/azQWzQtiAAw1ONc=", + "rev": "27232a8c019c5502d870c1531de2d1c9d6611534", + "sha256": "sha256-r+j9IysZO5qYtjEgwZA9c/QlnIhEK1cwCltCoPBJX1o=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "ec63e739fc3ee88102090d557558d1e5b048b255" + "version": "27232a8c019c5502d870c1531de2d1c9d6611534" }, "limbusart": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index ea7c6b4..4aa9a38 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -124,17 +124,17 @@ }; hydrant = { pname = "hydrant"; - version = "ec63e739fc3ee88102090d557558d1e5b048b255"; + version = "27232a8c019c5502d870c1531de2d1c9d6611534"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "ec63e739fc3ee88102090d557558d1e5b048b255"; + rev = "27232a8c019c5502d870c1531de2d1c9d6611534"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-0EEEn9F1zdTlDSEwCnkPCANBiEV/azQWzQtiAAw1ONc="; + sha256 = "sha256-r+j9IysZO5qYtjEgwZA9c/QlnIhEK1cwCltCoPBJX1o="; }; - date = "2026-03-06"; + date = "2026-03-11"; }; limbusart = { pname = "limbusart"; diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 30c2b13..6c29d17 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -67,7 +67,7 @@ D( CF_PROXY_OFF, ), DZWONEK("vpn", CF_PROXY_OFF), - VOLSINII("tap", CF_PROXY_OFF), + VOLSINII("plc", CF_PROXY_OFF), // github pages CNAME("dev", "90-008.github.io."), // fastmail diff --git a/hosts/chernobog/modules/usbmuxd.nix b/hosts/chernobog/modules/usbmuxd.nix new file mode 100644 index 0000000..31bdfa9 --- /dev/null +++ b/hosts/chernobog/modules/usbmuxd.nix @@ -0,0 +1,3 @@ +{ + services.usbmuxd.enable = true; +} diff --git a/hosts/volsinii/modules/hydrant.nix b/hosts/volsinii/modules/hydrant.disabled similarity index 100% rename from hosts/volsinii/modules/hydrant.nix rename to hosts/volsinii/modules/hydrant.disabled diff --git a/hosts/volsinii/modules/nginx.nix b/hosts/volsinii/modules/nginx.nix index 5d0090a..f3dc48a 100644 --- a/hosts/volsinii/modules/nginx.nix +++ b/hosts/volsinii/modules/nginx.nix @@ -43,6 +43,30 @@ acceptTerms = true; defaults.email = (import "${inputs.self}/personal.nix").emails.primary; defaults.webroot = "/var/lib/acme/acme-challenge"; - # certs."tap.gaze.systems" = { }; + certs."plc.gaze.systems" = { }; + }; + + services.nginx.virtualHosts."plc.gaze.systems" = { + useACMEHost = "plc.gaze.systems"; + forceSSL = true; + quic = true; + kTLS = true; + locations."/" = { + proxyPass = "http://localhost:8000"; + proxyWebsockets = true; + }; + }; + + systemd.services.allegedly = { + description = "allegedly mirror service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + WorkingDirectory = "/root/allegedly2"; + ExecStart = "/root/allegedly2/target/release/allegedly mirror --wrap-fjall /root/plc3"; + Restart = "on-failure"; + RestartSec = "5s"; + }; }; } diff --git a/pkgs-set/pkgs/antigravity.nix/information.json b/pkgs-set/pkgs/antigravity.nix/information.json index e97eb45..a18415f 100644 --- a/pkgs-set/pkgs/antigravity.nix/information.json +++ b/pkgs-set/pkgs/antigravity.nix/information.json @@ -1,22 +1,22 @@ { - "version": "1.19.6", + "version": "1.20.5", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/linux-x64/Antigravity.tar.gz", - "sha256": "80522c9d60bcc04bb13d40fa136601d184dc83f36bb9065eb29cc456db4c29e1" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-x64/Antigravity.tar.gz", + "sha256": "5b87664f454da487b8dee87aaf5e3361d9ba79b947770b798bd0fa874a9827e5" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/linux-arm/Antigravity.tar.gz", - "sha256": "fba4265d3646ad002b39774d5e06b36a826bd82e70c11297379258d4a06fe8a8" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-arm/Antigravity.tar.gz", + "sha256": "26fc65c4b538470ed1198f3d0ad855d1e4d81a9bfcbc607816b74de35999dbbf" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/darwin-x64/Antigravity.zip", - "sha256": "9a96e8aa2e6f6ba8c4e137f44950690853e42f4a0ae0ec79b822113bd42ef30e" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-x64/Antigravity.zip", + "sha256": "54fdcf8eac2eab176b04e587a5679d2993701fe4e5788e79f25c7ced2de605ef" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.19.6-6514342219874304/darwin-arm/Antigravity.zip", - "sha256": "0e0c3ade07d2c677eaa02a26b50df994bbeed8905dce583d164eff5ffc575530" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-arm/Antigravity.zip", + "sha256": "d3e6e75299062720a3300634305f2030ab8fcb4efb5ce8642305a576554caaca" } } } diff --git a/pkgs-set/pkgs/iloader.nix b/pkgs-set/pkgs/iloader.nix new file mode 100644 index 0000000..4d2d2db --- /dev/null +++ b/pkgs-set/pkgs/iloader.nix @@ -0,0 +1,27 @@ +{ + pkgs, + ... +}: +pkgs.appimageTools.wrapType2 rec { + pname = "iloader"; + version = "2.0.6"; + + src = + pkgs.fetchurl { + url = "https://github.com/nab138/iloader/releases/download/v${version}/iloader-linux-amd64.AppImage"; + hash = "sha256-KS/ovrsjmeCmVW5oK/qQWT5rdTSLV6aOxipkBhqthYA="; + }; + + extraInstallCommands = let + contents = pkgs.appimageTools.extractType2 {inherit pname version src;}; + in '' + mkdir -p "$out/share/applications" + cp --no-preserve=ownership,mode -r ${contents}/usr/share/* "$out/share" + cp --no-preserve=ownership,mode "${contents}/${pname}.desktop" "$out/share/applications/" + substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=iloader' 'Exec=${meta.mainProgram}' + ''; + + meta = { + mainProgram = "iloader"; + }; +} diff --git a/users/mayer/default.nix b/users/mayer/default.nix index 963e1d4..aa94b97 100644 --- a/users/mayer/default.nix +++ b/users/mayer/default.nix @@ -127,7 +127,7 @@ in ] [ # "zen" - # "discord" + "discord" "clickee" "arrpc" ] @@ -161,14 +161,17 @@ in cemu tor-browser feishin + # these are for gitnexus nodejs gcc gnumake python3 + # sidelaoding ]) ++ [ terra.helium terra.antigravity terra.pi-coding-agent + terra.iloader # terra.gitnexus # (terra.pds-upload.override { # secretsFile = config.age.secrets.atfileCfg.path; diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 8e70656..172ba0a 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -21,9 +21,9 @@ in buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/discord \ - --add-flags "--proxy-server=socks5://127.0.0.1:1337" + --add-flags "--proxy-server=socks5://127.0.0.1:1338" wrapProgram $out/bin/Discord \ - --add-flags "--proxy-server=socks5://127.0.0.1:1337" + --add-flags "--proxy-server=socks5://127.0.0.1:1338" ''; }) ];