diff --git a/_sources/generated.json b/_sources/generated.json index 9d3e3ad..69e557a 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "blog": { "cargoLock": null, - "date": "2026-03-15", + "date": "2026-03-18", "extract": null, "name": "blog", "passthru": null, @@ -32,13 +32,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "8c75080abe6c733b20a81722252bb4b8062b8b9e", - "sha256": "sha256-WpIEhnAPhqAp5Ln/08UNTVvwH/lGueOckciDbP6QVFI=", + "rev": "0eeab661f0d3fa0de317ea9556ecc94e81955b40", + "sha256": "sha256-m5bS5lMvGF4TER3eXElENZcl43XKsgLSHsCznctITxA=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "8c75080abe6c733b20a81722252bb4b8062b8b9e" + "version": "0eeab661f0d3fa0de317ea9556ecc94e81955b40" }, "clickee": { "cargoLock": null, @@ -186,7 +186,7 @@ }, "hydrant": { "cargoLock": null, - "date": "2026-03-13", + "date": "2026-03-20", "extract": null, "name": "hydrant", "passthru": null, @@ -196,13 +196,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "4e6272671e7dc90a820deadb1abf6e284e80d1d0", - "sha256": "sha256-nM+e9e2GYsGGZRzVuKDgberDMVIpKt9DskXUcb86dms=", + "rev": "6d735f195277af2f8d6ed6e86590a2027db2c7d4", + "sha256": "sha256-aJAVAtXy5QII/GmXQwAvT/g9K4TogTUNXoY8PgyBgJI=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "4e6272671e7dc90a820deadb1abf6e284e80d1d0" + "version": "6d735f195277af2f8d6ed6e86590a2027db2c7d4" }, "limbusart": { "cargoLock": null, @@ -288,7 +288,7 @@ }, "nixpkgs-xr": { "cargoLock": null, - "date": "2026-03-14", + "date": "2026-03-23", "extract": null, "name": "nixpkgs-xr", "passthru": null, @@ -300,12 +300,12 @@ "name": null, "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "b661b4f69e9dd0ef7fc243e4abc281620dfba76b", - "sha256": "sha256-3ewc8BXQ7mcvc2OhcPFfWTvMwQedZ+EUkDk3yGO8LIc=", + "rev": "82adacd2ac84b353b98e9462be1e8af969a5c1f7", + "sha256": "sha256-/figgEf9bJgifAotR2z+KqAUSKriOL17DGkgwJqlI6w=", "sparseCheckout": [], "type": "github" }, - "version": "b661b4f69e9dd0ef7fc243e4abc281620dfba76b" + "version": "82adacd2ac84b353b98e9462be1e8af969a5c1f7" }, "nsid-tracker": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index aaa845a..15f47e9 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -20,17 +20,17 @@ }; blog = { pname = "blog"; - version = "8c75080abe6c733b20a81722252bb4b8062b8b9e"; + version = "0eeab661f0d3fa0de317ea9556ecc94e81955b40"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "8c75080abe6c733b20a81722252bb4b8062b8b9e"; + rev = "0eeab661f0d3fa0de317ea9556ecc94e81955b40"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-WpIEhnAPhqAp5Ln/08UNTVvwH/lGueOckciDbP6QVFI="; + sha256 = "sha256-m5bS5lMvGF4TER3eXElENZcl43XKsgLSHsCznctITxA="; }; - date = "2026-03-15"; + date = "2026-03-18"; }; clickee = { pname = "clickee"; @@ -124,17 +124,17 @@ }; hydrant = { pname = "hydrant"; - version = "4e6272671e7dc90a820deadb1abf6e284e80d1d0"; + version = "6d735f195277af2f8d6ed6e86590a2027db2c7d4"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "4e6272671e7dc90a820deadb1abf6e284e80d1d0"; + rev = "6d735f195277af2f8d6ed6e86590a2027db2c7d4"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-nM+e9e2GYsGGZRzVuKDgberDMVIpKt9DskXUcb86dms="; + sha256 = "sha256-aJAVAtXy5QII/GmXQwAvT/g9K4TogTUNXoY8PgyBgJI="; }; - date = "2026-03-13"; + date = "2026-03-20"; }; limbusart = { pname = "limbusart"; @@ -190,15 +190,15 @@ }; nixpkgs-xr = { pname = "nixpkgs-xr"; - version = "b661b4f69e9dd0ef7fc243e4abc281620dfba76b"; + version = "82adacd2ac84b353b98e9462be1e8af969a5c1f7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixpkgs-xr"; - rev = "b661b4f69e9dd0ef7fc243e4abc281620dfba76b"; + rev = "82adacd2ac84b353b98e9462be1e8af969a5c1f7"; fetchSubmodules = false; - sha256 = "sha256-3ewc8BXQ7mcvc2OhcPFfWTvMwQedZ+EUkDk3yGO8LIc="; + sha256 = "sha256-/figgEf9bJgifAotR2z+KqAUSKriOL17DGkgwJqlI6w="; }; - date = "2026-03-14"; + date = "2026-03-23"; }; nsid-tracker = { pname = "nsid-tracker"; diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 6c29d17..0eabf63 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -67,7 +67,7 @@ D( CF_PROXY_OFF, ), DZWONEK("vpn", CF_PROXY_OFF), - VOLSINII("plc", CF_PROXY_OFF), + VOLSINII(["plc", "hydrant"], CF_PROXY_OFF), // github pages CNAME("dev", "90-008.github.io."), // fastmail diff --git a/hosts/chernobog/modules/vr.nix b/hosts/chernobog/modules/vr.nix index 38859b9..da8548c 100644 --- a/hosts/chernobog/modules/vr.nix +++ b/hosts/chernobog/modules/vr.nix @@ -10,17 +10,19 @@ openFirewall = true; defaultRuntime = true; autoStart = true; + highPriority = true; config = { enable = true; json = { scale = 1.0; bitrate = 60000000; - encoders = [ + encoder = { encoder = "vaapi"; codec = "h265"; + bit-depth = 8; } - ]; + ; }; }; }; diff --git a/hosts/trimounts/modules/wisp-random.nix b/hosts/trimounts/modules/wisp-random.nix index 9e90d26..9cdb797 100644 --- a/hosts/trimounts/modules/wisp-random.nix +++ b/hosts/trimounts/modules/wisp-random.nix @@ -25,6 +25,7 @@ in { PORT = toString port; WISP_API_URL = "https://wisp.place"; HYDRANT_BIN = "${terra.hydrant}/bin/hydrant"; + CURSOR = "0"; }; serviceConfig = rec { diff --git a/hosts/volsinii/default.nix b/hosts/volsinii/default.nix index de539e8..050cda2 100644 --- a/hosts/volsinii/default.nix +++ b/hosts/volsinii/default.nix @@ -13,6 +13,7 @@ ../../modules/stylix-null.nix ../../users/root ../../users/dawn + ../../users/claudey ./disk-config.nix ] ++ (tlib.importFolder (toString ./modules)); diff --git a/hosts/volsinii/modules/hydrant-doc.nix b/hosts/volsinii/modules/hydrant-doc.nix new file mode 100644 index 0000000..c69bdfc --- /dev/null +++ b/hosts/volsinii/modules/hydrant-doc.nix @@ -0,0 +1,21 @@ +{ ... }: +let + domain = "hydrant.gaze.systems"; +in +{ + security.acme.certs."plc.gaze.systems".extraDomainNames = [domain]; + + services.nginx.virtualHosts.${domain} = { + useACMEHost = "plc.gaze.systems"; + forceSSL = true; + quic = true; + kTLS = true; + root = "/www/hydrant"; + locations."/" = { + tryFiles = "$uri $uri/ =404"; + }; + locations."= /" = { + return = "301 /hydrant/index.html"; + }; + }; +} diff --git a/hosts/volsinii/modules/hydrant.disabled b/hosts/volsinii/modules/hydrant.disabled index 3bd92bf..2260e3a 100644 --- a/hosts/volsinii/modules/hydrant.disabled +++ b/hosts/volsinii/modules/hydrant.disabled @@ -12,11 +12,12 @@ after = ["network.target"]; environment = { HYDRANT_FULL_NETWORK = "true"; - HYDRANT_FIREHOSE_WORKERS = "128"; - HYDRANT_BACKFILL_CONCURRENCY_LIMIT = "256"; - HYDRANT_DB_WORKER_THREADS = "16"; - HYDRANT_CRAWLER_MAX_PENDING_REPOS = "10000"; - HYDRANT_PLC_URL = "https://plc.wtf,https://plc.directory"; + HYDRANT_CRAWLER_MAX_PENDING_REPOS = "5000"; + HYDRANT_CRAWLER_RESUME_PENDING_REPOS = "2000"; + HYDRANT_CURSOR_SAVE_INTERVAL = "1"; + HYDRANT_PLC_URL = "https://plc.directory,http://localhost:8000"; + HYDRANT_DATA_COMPRESSION = "zstd"; + HYDRANT_JOURNAL_COMPRESSION = "lz4"; }; serviceConfig = { Type = "simple"; diff --git a/hosts/volsinii/modules/nginx.nix b/hosts/volsinii/modules/nginx.nix index f3dc48a..ad0af33 100644 --- a/hosts/volsinii/modules/nginx.nix +++ b/hosts/volsinii/modules/nginx.nix @@ -41,8 +41,11 @@ security.acme = { acceptTerms = true; - defaults.email = (import "${inputs.self}/personal.nix").emails.primary; - defaults.webroot = "/var/lib/acme/acme-challenge"; + defaults = { + group = "nginx"; + email = (import "${inputs.self}/personal.nix").emails.primary; + webroot = "/var/lib/acme/acme-challenge"; + }; certs."plc.gaze.systems" = { }; }; diff --git a/hosts/volsinii/modules/tap.disabled b/hosts/volsinii/modules/tap.disabled index 8eff7fe..31ffb8d 100644 --- a/hosts/volsinii/modules/tap.disabled +++ b/hosts/volsinii/modules/tap.disabled @@ -1,51 +1,32 @@ -{ terra, config, ... }: -let - domain = "tap.gaze.systems"; - cfg = config.services.bluesky-tap; -in +{ terra, ... }: { imports = [../../../modules/bluesky-tap.nix]; - services.bluesky-tap = { - enable = true; - package = terra.bluesky-tap; - fullNetwork = true; - databaseUrl = "postgresql://bluesky-tap@/bluesky-tap"; - bind = "127.0.0.1:2480"; - # metricsListen = "127.0.0.1:8765"; - # logLevel = "debug"; - disableAcks = true; - }; - systemd.services.bluesky-tap.environment = { - TAP_OUTBOX_PARALLELISM = "8"; - TAP_RESYNC_PARALLELISM = "16"; - TAP_FIREHOSE_PARALLELISM = "16"; - TAP_MAX_DB_CONNS = "64"; - # TAP_OUTBOX_CAPACITY = "70000"; - # TAP_OUTBOX_ONLY = "true"; - # TAP_RETRY_TIMEOUT = "10s"; - }; + # services.bluesky-tap = { + # enable = true; + # package = terra.bluesky-tap; + # fullNetwork = true; + # databaseUrl = "postgresql://bluesky-tap@/bluesky-tap"; + # bind = "127.0.0.1:2480"; + # # metricsListen = "127.0.0.1:8765"; + # # logLevel = "debug"; + # disableAcks = true; + # }; + # systemd.services.bluesky-tap.environment = { + # TAP_OUTBOX_PARALLELISM = "4"; + # TAP_RESYNC_PARALLELISM = "64"; + # TAP_FIREHOSE_PARALLELISM = "24"; + # TAP_MAX_DB_CONNS = "64"; + # TAP_RELAY_URL = "https://relay.fire.hose.cam"; + # }; # setup postgres services.postgresql = { enable = true; - ensureDatabases = ["bluesky-tap"]; + ensureDatabases = ["claudey"]; ensureUsers = [{ - name = "bluesky-tap"; + name = "claudey"; ensureDBOwnership = true; }]; }; - - # # nginx reverse proxy - # services.nginx.virtualHosts.${domain} = { - # useACMEHost = domain; - # forceSSL = true; - # quic = true; - # kTLS = true; - - # # locations."/" = { - # # proxyPass = "http://${cfg.bind}"; - # # proxyWebsockets = true; - # # }; - # }; } \ No newline at end of file diff --git a/pkgs-set/overlays/nixpkgs-xr.nix b/pkgs-set/overlays/nixpkgs-xr.nix index 51ae3f3..9b0e11e 100644 --- a/pkgs-set/overlays/nixpkgs-xr.nix +++ b/pkgs-set/overlays/nixpkgs-xr.nix @@ -1,3 +1,3 @@ {inputs, ...}: final: prev: ((import inputs.nixpkgs-xr).overlays.default final prev) -// { wivrn = prev.wivrn; } +# // { wivrn = prev.wivrn; } diff --git a/pkgs-set/pkgs/bluesky-tap.nix/default.nix b/pkgs-set/pkgs/bluesky-tap.nix/default.nix index d09017a..44d2853 100644 --- a/pkgs-set/pkgs/bluesky-tap.nix/default.nix +++ b/pkgs-set/pkgs/bluesky-tap.nix/default.nix @@ -4,7 +4,7 @@ ... }: let - rev = "1286ca7a7cb25ece0e7d49648b7655cc285aee0f"; + rev = "9cf6b7ee3c3a8a8d768b76bc957ef953fa897486"; in buildGoModule { pname = "bluesky-tap"; @@ -14,12 +14,12 @@ buildGoModule { owner = "bluesky-social"; repo = "indigo"; inherit rev; - hash = "sha256-yksMw5ommI+ewvfudlpfMpSWUtpP3GC4XwnmmSYT7ks="; + hash = "sha256-f5CK4dyyMRfTi54y8maVpKbpJMfkc/0JVlu48lQ7UjQ="; }; # patches = [./tap_deadlock_fix.patch]; - vendorHash = "sha256-KRR+8icVuMGBQlR8h4KE6rpWWj9lrkNOJlxbFLyFsUI="; + vendorHash = "sha256-s1S+b+QbptqJ2mxqkvsn7M5VWfLrlwpWgRjg6lq2WVE="; subPackages = [ "cmd/tap" ]; diff --git a/users/claudey/default.nix b/users/claudey/default.nix new file mode 100644 index 0000000..53f4b9b --- /dev/null +++ b/users/claudey/default.nix @@ -0,0 +1,53 @@ +{lib, tlib, inputs, pkgs, ...}@nixosArgs: +let + l = lib; + nixosConfig = nixosArgs.config; +in +{ + users.users.claudey = { + isNormalUser = true; + createHome = true; + home = "/home/claudey"; + shell = pkgs.bashInteractive; + openssh.authorizedKeys.keys = [ + (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") + ]; + extraGroups = ["compsize"]; + }; + users.groups.compsize = {}; + + environment.shells = with pkgs; [ + bashInteractive + nushell + ]; + + nix.settings.allowed-users = ["claudey"]; + security.wrappers.compsize = { + source = "${pkgs.compsize}/bin/compsize"; + capabilities = "cap_sys_admin=ep"; + owner = "root"; + group = "compsize"; + setuid = false; + permissions = "u+rx,g+rx,o-rwx"; + }; + + home-manager.users.claudey = {pkgs, ...}: { + imports = + let + modulesToEnable = l.flatten [ + # dev stuff + [ + "git" + ] + ]; + in + l.flatten [ + (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable) + ]; + + home = { + homeDirectory = nixosConfig.users.users.claudey.home; + packages = with pkgs; [websocat claude-code cargo go gnumake sqlite postgresql (hiPrio clang) (lowPrio gcc) wild python3 nodejs]; + }; + }; +} diff --git a/users/mayer/default.nix b/users/mayer/default.nix index 7d1dda9..83e19a9 100644 --- a/users/mayer/default.nix +++ b/users/mayer/default.nix @@ -159,6 +159,7 @@ in (prismlauncher.override { additionalLibs = with pkgs; [libXtst libxkbcommon libXt]; }) + xivlauncher lutris signal-desktop bs-manager @@ -170,6 +171,7 @@ in gcc gnumake python3 + gh # sidelaoding ]) ++ [ terra.helium