diff --git a/configurations/home/srid@zest.nix b/configurations/home/srid@zest.nix index 1c81518..256d559 100644 --- a/configurations/home/srid@zest.nix +++ b/configurations/home/srid@zest.nix @@ -39,7 +39,7 @@ in "sincereintent" "pureintent" "naiveintent" - "vanjaram.tail12b27.ts.net" + "nix-infra@idli-01.tail12b27.ts.net" "nix-infra@rasam.tail12b27.ts.net" ]; @@ -48,11 +48,10 @@ in pkgs.zellij-one pkgs.twitter-convert pkgs.python3 + pkgs.uv pkgs.portfwd # The kolu terminal-side CLIs, without running the kolu service itself. - inputs.kolu.packages.${pkgs.stdenv.hostPlatform.system}.kaval inputs.kolu.packages.${pkgs.stdenv.hostPlatform.system}.kaval-tui - inputs.kolu.packages.${pkgs.stdenv.hostPlatform.system}.padi inputs.kolu.packages.${pkgs.stdenv.hostPlatform.system}.padi-tui ]; } diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix index 10b8234..0bb9aa9 100644 --- a/configurations/nixos/pureintent/default.nix +++ b/configurations/nixos/pureintent/default.nix @@ -61,7 +61,7 @@ in services.kolu.allowedOrigins = [ "https://pureintent.rooster-blues.ts.net" ]; # Point padi at zest for host switching (pureintent only). home-manager # concatenates this onto the module's own Environment list. - systemd.user.services.kolu.Service.Environment = [ "KOLU_PADI_HOST=srid@zest" ]; + systemd.user.services.kolu.Service.Environment = [ "KOLU_PADI_HOST=zest" ]; # Watch the pu-managed CI fleet from here (only reachable from pureintent). services.drishti.hosts = [ "localhost" ] ++ ciHosts; } diff --git a/configurations/nixos/pureintent/devbox.nix b/configurations/nixos/pureintent/devbox.nix index 50f9e21..7707a0f 100644 --- a/configurations/nixos/pureintent/devbox.nix +++ b/configurations/nixos/pureintent/devbox.nix @@ -13,7 +13,7 @@ let export HTTP_PROXY=socks5://127.0.0.1:${toString socksPort} ''; - vanjaram-run = pkgs.writeShellScriptBin "vanjaram-run" '' + juspay-run = pkgs.writeShellScriptBin "juspay-run" '' ${proxyExports} exec ${proxychainsBin} "$@" ''; @@ -46,7 +46,7 @@ in }; environment.systemPackages = [ - vanjaram-run + juspay-run pu xyne-boxes ]; diff --git a/flake.lock b/flake.lock index 1750dd4..605e5a4 100644 --- a/flake.lock +++ b/flake.lock @@ -283,16 +283,16 @@ "bun2nix": "bun2nix" }, "locked": { - "lastModified": 1783601954, - "narHash": "sha256-tlebQqzg5CS/liUGV9GI8Rjxduxs29bXZcohhcVj/o4=", + "lastModified": 1783785335, + "narHash": "sha256-RB40Vi0n/TMlDu+8HHngKUA/M3QrRE6f+WFKUHXBUaU=", "owner": "srid", "repo": "drishti", - "rev": "037ebbdd72e35d2d53f8c8199ad86d7c07b6a669", + "rev": "f85202c3498cb60217665069f68438a1868a0e1d", "type": "github" }, "original": { "owner": "srid", - "ref": "master", + "ref": "w5-alerts", "repo": "drishti", "type": "github" } @@ -845,16 +845,16 @@ }, "kolu": { "locked": { - "lastModified": 1783608370, - "narHash": "sha256-M/gSZUkS35LUzNpDg5JSiL2Bz4Vod/pd5f7kMDLBHw0=", + "lastModified": 1783752819, + "narHash": "sha256-f8nYlg5+CdLfJ3HiUmNsPgAEEzY1m24sRgywQ0soDx8=", "owner": "juspay", "repo": "kolu", - "rev": "5d689f9fd2b04f0c0e98f2122ef04c4d77a17155", + "rev": "de4b5687708685a3ffac0875ea15c8db626e2a5c", "type": "github" }, "original": { "owner": "juspay", - "ref": "w6-honest-connect", + "ref": "W5", "repo": "kolu", "type": "github" } diff --git a/flake.nix b/flake.nix index fcad721..43cc80f 100644 --- a/flake.nix +++ b/flake.nix @@ -34,11 +34,12 @@ jumphost-nix.url = "github:srid/jumphost-nix"; jumphost-nix.flake = false; - # Pinned to PR #1730 (padi W6 — the honest connect): https://github.com/juspay/kolu/pull/1730 - kolu.url = "github:juspay/kolu/w6-honest-connect"; + # Pinned to PR #1759 (padi W5 — cross-host attention): https://github.com/juspay/kolu/pull/1759 + kolu.url = "github:juspay/kolu/W5"; # drishti remote host monitor (home-manager module) - drishti.url = "github:srid/drishti/master"; + # Pinned to PR #93 (W5 alerts cell): https://github.com/srid/drishti/pull/93 + drishti.url = "github:srid/drishti/w5-alerts"; # Juspay's AI tooling repo. We consume only its opencode home-manager # module (config only, not the package) via homeModules.opencode. diff --git a/justfile b/justfile index 4a5306f..0b7b6ab 100644 --- a/justfile +++ b/justfile @@ -38,10 +38,7 @@ _kolu-update: nix flake update kolu drishti [parallel] -_kolu-after-update: _kolu-build _kolu-activate-pureintent _kolu-activate-local - -_kolu-build: - nix build --inputs-from . kolu +_kolu-after-update: _kolu-activate-pureintent _kolu-activate-local _kolu-activate-pureintent: just activate pureintent diff --git a/modules/home/work/juspay.nix b/modules/home/work/juspay.nix index 8ea469a..8c230b8 100644 --- a/modules/home/work/juspay.nix +++ b/modules/home/work/juspay.nix @@ -15,7 +15,7 @@ in programs.jumphost = { enable = true; - host = "srid@vanjaram.tail12b27.ts.net"; + host = "nix-infra@idli-01.tail12b27.ts.net"; sshHosts = { "ssh.bitbucket.juspay.net".user = "git";