From 5881b9c8bee86dbf73cc3551d7f598b6ce9b1f3c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 15 Nov 2026 15:15:01 -0500 Subject: [PATCH] general clean up of nbot --- hosts/hl-fwdesk/services/nbot.nix | 41 +----------------------------- pkgs/buzz-cli/default.nix | 6 ++--- pkgs/buzz-desktop/default.nix | 4 +-- pkgs/delta-editor/default.nix | 4 +-- secrets/nbot-goose.age | Bin 1330 -> 1032 bytes 5 files changed, 8 insertions(+), 47 deletions(-) diff --git a/hosts/hl-fwdesk/services/nbot.nix b/hosts/hl-fwdesk/services/nbot.nix index 7f096f6..337f252 100644 --- a/hosts/hl-fwdesk/services/nbot.nix +++ b/hosts/hl-fwdesk/services/nbot.nix @@ -29,53 +29,14 @@ let # Goose settings sent to every container (also on fws1). # Values come from the nbot-goose secret. agent_env = { - GOOSE_PROVIDER = "$GOOSE_PROVIDER"; - GOOSE_MODEL = "$GOOSE_MODEL"; - OPENROUTER_API_KEY = "$OPENROUTER_API_KEY"; - CLAUDE_CODE_OAUTH_TOKEN = "$CLAUDE_CODE_OAUTH_TOKEN"; COMMAND_CODE_API_KEY = "$COMMAND_CODE_API_KEY"; GH_TOKEN = "$GH_TOKEN"; - DIAGNIX_KEY = "$DIAGNIX_KEY"; # base64 private key for lab-ssh (diagnix) - # Shared Go caches, mounted by rw_binds on each node. + DIAGNIX_KEY = "$DIAGNIX_KEY"; GOMODCACHE = "/var/cache/go/mod"; GOCACHE = "/var/cache/go/build"; }; model_providers = [ - # { - # id = "claude-acp"; - # name = "Claude ACP (Ari Credentials)"; - # key_env = "CLAUDE_CODE_OAUTH_TOKEN"; - # models = [ "default" "sonnet" "haiku" "opus" ]; - # users = [ "U0CBGSS4U6A" ]; - # } - { - id = "claude-oauth"; - name = "Claude OAuth"; - personal = true; - upstream = "https://api.anthropic.com"; - engine = "claude-code"; - login = "claude"; - models = [ "default" "opus" "sonnet" "haiku" "fable" ]; - } - # { - # id = "codex"; - # name = "Codex (OpenAI API key)"; - # personal = true; - # upstream = "https://api.openai.com"; - # engine = "openai"; - # auth = "bearer"; - # models = [ "gpt-6.1-codex" "gpt-6.1" ]; - # } - # { - # id = "xai"; - # name = "Grok"; - # personal = true; - # upstream = "https://api.x.ai"; - # engine = "openai"; - # auth = "bearer"; - # models = [ "grok-4" ]; - # } { id = "custom_commandcode"; name = "Command Code"; diff --git a/pkgs/buzz-cli/default.nix b/pkgs/buzz-cli/default.nix index ec0a2f5..aaaa7f7 100644 --- a/pkgs/buzz-cli/default.nix +++ b/pkgs/buzz-cli/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "buzz-cli"; - version = "0.5.28"; + version = "0.5.30"; src = fetchFromGitHub { owner = "block"; repo = "buzz"; rev = "desktop-v${version}"; - hash = "sha256-NEsLQwcoQ2zTgznFgGFGNgYPnoclicNVycSEjl7I0Wo="; + hash = "sha256-Ay6zUeHHYO92/Fs4FGHm1+QQUoUEQjYyOC3dDg5+7Ss="; }; # The workspace has git deps in [patch.crates-io]; cargoHash covers them. - cargoHash = "sha256-UQ8qNqoeDwkwhmVZebi++gb2GP61dr1Zv2QU9mJ6KJ8="; + cargoHash = lib.fakeHash; # Only this crate; the workspace has 30+ others (relay, db, ...). cargoBuildFlags = [ "-p" "buzz-cli" ]; diff --git a/pkgs/buzz-desktop/default.nix b/pkgs/buzz-desktop/default.nix index eb6b3fb..99f8103 100644 --- a/pkgs/buzz-desktop/default.nix +++ b/pkgs/buzz-desktop/default.nix @@ -23,11 +23,11 @@ let pname = "buzz-desktop"; - version = "0.5.28"; + version = "0.5.30"; src = fetchurl { url = "https://github.com/block/buzz/releases/download/desktop-v${version}/Buzz_${version}_amd64.AppImage"; - hash = "sha256-YCI6wn2HQiJqC149teH5dEGyZ/9jq7kFeTsz/mVoh0w="; + hash = "sha256-AAZc110TQPDucGamgOUgimlXw4mjquzBgvTwc6oWzZo="; }; extracted = appimageTools.extractType2 { diff --git a/pkgs/delta-editor/default.nix b/pkgs/delta-editor/default.nix index ed7cc02..8595943 100644 --- a/pkgs/delta-editor/default.nix +++ b/pkgs/delta-editor/default.nix @@ -29,7 +29,7 @@ let pname = "delta-editor"; - version = "0.26.0"; + version = "0.26.1"; apiUrl = "https://delta.dev/api/releases/nightly/${version}/asset?asset=delta&os=linux&arch=x86_64"; @@ -38,7 +38,7 @@ let inherit version; outputHashMode = "flat"; - outputHash = "sha256-TnxHgLi+BqoAAWlaszfdZalH/JF5b1TJWB5hj5fNjMM="; + outputHash = "sha256-5JFdgf0wPtt9Wb6/9EYPj6i+wmDeFKZ0EYfQQ3T5Ym4="; nativeBuildInputs = [ curl jq cacert ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/secrets/nbot-goose.age b/secrets/nbot-goose.age index c522c8ef76eb23032fb46c34203a070d09a99551..8ab6a01e1cdea05aebaa4102630ab15def7ea97b 100644 GIT binary patch delta 1002 zcmVzYi)QiNN!qrcwu%hb8Ra~Vn%r~MsYWJNLp8CPE~n&Z$@u8 zb4N>63N0-yAT~=dGiYu~S5|mrS5s(tL~%=Ya&c@jXHGPAOHXZOS6DP?Q(7`ic4kji z3LWvyM0BYF1b+)a30)XlBumJs{=Whc2B7ASV#{INoL!E}Bpkg#^J@+PXfgm^PPn<< zU!%Z367AC!6e`u7PE3_<+6sBdn`iekZav5)(>5LW>g694`YoIzGf*tU_gtX6dKmQi z_;U>yuE%z6@$M&hw9ap{k(T)#r%>F_`+EOWX=sUCpno(ep~zPo-aZeKu_8l$=CRfh zD&N%UA^cMF3q2*`iS193l>qenfq6<`mUKjfa{X61^d9)I57HuSv%t3coEwyOZ%V3^ zh>jj%6+O3&N!qc-xGL_|^OC#(JXdc*rT7DBL^8BIzLnn)F2wMV_Nzb?R-1 z+4x_By+5R5jQ;~)`;oABshhHO!~Etl1Rz`%y~Jq{VD_q7MPZl zV!nWuJ*sqPqCfvlvi@Baarr@vOyV-K)x$#QzzXt=8<{E--`}ZjVFQ9Pok+P27L7KD zu8aA3v7km){?oAs2$R*GqdV|6{Y-ze9N`;;Uj=#;3M9ixTzB)Ltw&zoE<(s=P6b)% zw|~lLYD|SAD-F2_z39RzEWf!!jC^2sh=Rfd#Kej}3|lFA)G8ZrAnqg z1-xsEL1H!EJX&|P1Z?6b!wLyicqmY;?B%Kb!4Sk_5LbHtr0=(()D4m4O4jdY%&Sob YxAL14?vz-1B9?1poj5 delta 1303 zcmV+y1?c*S2(k*0EPqEZbTf1~T5?ZjN--;XO;2x6acEg~cS$QuG)FcyVJlNjZ&64> zMPhVAK?+G$Ff&nSWq40eIAJw5IA>O8cv?+xcQbimH$`PiS#vmdZ8Bq1VRlw8O$seO zAaiqQEoEdfH8n9gAZL0^RCjkEZ7WVjPhmntVq$4(aY1rXQ-4chbvRN=Sus^`d3kMX zS4(wnayVgEPD?>&3Uf(hbvZ|NLNH=DR8m=LQ(ALOOEhC=Nla`|a$`3^dT}pyPIhi; zR$*6F3N0-yAZ0Z|H!)3RYj{aQPFPHCG)zKuW@cqdZf0^)NHa`BD?u?>W=L^PO>t#7 z3I((`s~7Og-+yKCR6AD&x-Lj?JHWgzqRLA^U&YF5IRAz4XS|lcwJ*>}0iUf1%I8f+ zxzS9Rsfa06q|w{&lm$+T#@5pUdkfp$BG(H!2De8wM#*P0q{Mw)AC>KV&pw#h)=D z@-!kMYnNW-tYeNl~dn6`YHckwd++IgluePSVeYIb1NcBs}mI)2AQp4J|kSl>a_HYRA<*m zjSAi9p@t#60d=cGEp1lUZ}{_32`ot2SAY5*5~?d2LzJkRfgrPU>IS^z`vv9_fP%{R z;RX3J|NF$4Ijybu(Ziodk-9`yG?02=^?I8G4^GH*0LqI?vFr8G9G; z#9N~Ppr~^>=DIoC6fofBYnpSX>01G--g?8(jJ}x$O0mwnbho6xw#bA_719)))PFfQ zvtW#vwUp=*=9u%DV~*Q{@UScc8-hh;soNF4k#Q4D_`oQYNr_%K+P3S5xpQ?<&FLB} z8A>2ge$q{3&A`r*biHm!QdG`ou+(gLh*ZNGcnAtzK#?KJ1kS~ESvQgYV?)`MuTIcPqW*Dmx&Dt63L2~*2{SK} zt$;XKC|LspZL!z?MYE-)Xo?J=5J3BO+VBo>tyG?&njgEnE=ixeo8Fo-7w$6ra#Aby z-z2dmITGJu6~P@}O?isIoH#X0Ai9}H80?@MkBKYTeB(T*qieqY^4mPJpb#~NehO!r NKAjh>QO0!=nsZX0RT=;Q