Compare commits

...
6 Commits
Author SHA1 Message Date
ari fa5343f211 Merge branch 'main' of gitea.app.internal:ari/nixos-setup 2026-11-04 08:20:37 -05:00
ari 82480e88f4 latest ping for nbot 2026-11-04 08:19:02 -05:00
ari a60b842ee2 more nbot stuff 2026-11-03 19:21:50 -05:00
ari 2d09b6c69f nbots 2026-11-03 15:25:54 -05:00
ari e2bff381b9 nbots 2026-11-03 14:02:31 -05:00
ari 2b83e9c606 nbots 2026-11-03 10:22:40 -05:00
20 changed files with 313 additions and 65 deletions

No files matched your search

Generated
+26 -5
View File
@@ -2331,6 +2331,26 @@
"type": "github"
}
},
"nbot": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1793792764,
"narHash": "sha256-5hNJ6MiLTRmf5w6SQRzrrlxU4ZLY8obQP+ZkXlIBdZQ=",
"ref": "refs/heads/main",
"rev": "ee0b0b71580ad20101dfb01c52879297242be2a9",
"revCount": 123,
"type": "git",
"url": "ssh://git@github.com/asosnovsky/nbot.git"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/asosnovsky/nbot.git"
}
},
"nix": {
"inputs": {
"bdwgc": "bdwgc",
@@ -2817,12 +2837,12 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1792210252,
"narHash": "sha256-Mh0PUaIv4nFY+8wAGonaEh8iBzwsmdNlwjVHmFg1Biw=",
"rev": "09063bd1f2b36fd9fd793c36dfade7bd40a93dfc",
"revCount": 1095516,
"lastModified": 1793540411,
"narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
"rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
"revCount": 1106360,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1095516%2Brev-09063bd1f2b36fd9fd793c36dfade7bd40a93dfc/01a157d6-3d9b-79b3-a066-790f409256a3/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1106360%2Brev-0bb2eedc20e4739f29e8045034f2828ad7054f8f/01a19d56-7554-7803-a091-6a18d4aafdff/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -3290,6 +3310,7 @@
"hyprlauncher": "hyprlauncher",
"my-nixpkgs": "my-nixpkgs",
"nativelink": "nativelink",
"nbot": "nbot",
"nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database",
+13
View File
@@ -21,6 +21,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
# Slack bot that runs goose agents in nspawn containers.
nbot = {
url = "git+ssh://git@github.com/asosnovsky/nbot.git";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Off.
slackerbot = {
url = "git+https://gitea.skyg.ca/ari/slacker-bot.git";
inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -128,6 +133,7 @@
, hermenix
, robotnix
, skyg-linux-tracker
, nbot
, slackerbot
, nativelink
, hhstream
@@ -212,6 +218,10 @@
slackerbot-slack = ./secrets/slackerbot-slack.age;
slackerbot-goose = ./secrets/slackerbot-goose.age;
slackerbot-cluster = ./secrets/slackerbot-cluster.age;
nbot-slack = ./secrets/nbot-slack.age;
nbot-goose = ./secrets/nbot-goose.age;
nbot-cluster = ./secrets/nbot-cluster.age;
nbot-cluster-hl-fws1 = ./secrets/nbot-cluster-hl-fws1.age;
};
inherit
hyprlauncher
@@ -228,6 +238,7 @@
hermenix
robotnix
skyg-linux-tracker
nbot
slackerbot
nativelink
hhstream
@@ -389,6 +400,7 @@
nixos-hardware.nixosModules.framework-11th-gen-intel
disko.nixosModules.disko
slackerbot.nixosModules.host
nbot.nixosModules.host
];
};
hl-fwdesk = lib.makeNixOs {
@@ -400,6 +412,7 @@
hermenix.nixosModules.default
buildbot-nix.nixosModules.buildbot-worker
slackerbot.nixosModules.host
nbot.nixosModules.host
];
};
hl-bigbox1 = lib.makeNixOs {
+2 -2
View File
@@ -31,8 +31,8 @@ hosts/
| Folder | Host | Role |
| ------------- | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver |
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation; buildbot-nix CI worker (4 cores); slackerbot master |
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node; slackerbot worker |
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation; buildbot-nix CI worker (4 cores); nbot master (slackerbot off) |
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node; nbot worker (slackerbot off) |
| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD); Immich machine-learning (CUDA) |
| `hl-bigbox2/` | hl-bigbox2 | NFS storage server; Immich server/db (docker, `immich.home.sosnovsky.ca`) |
| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI), monitoring (Grafana, Prometheus, Loki, OTel collector) |
+1
View File
@@ -13,6 +13,7 @@ in
};
networking.firewall.allowedUDPPorts = openPorts;
networking.firewall.allowedTCPPorts = openPorts;
programs.mosh.enable = true;
networking.hosts = {
"0.0.0.0" = [
"auth.me.internal"
+1
View File
@@ -10,5 +10,6 @@
./linux-tracker.nix
./robotnix.nix
./slackerbot.nix
./nbot.nix
];
}
+103
View File
@@ -0,0 +1,103 @@
{ config, lib, pkgs, skyg-secrets, ... }:
let
ports = { cluster = 7946; };
homes = "/data/nbot";
secrets = [ "nbot-slack" "nbot-goose" "nbot-cluster" ];
settings = {
# The system each container boots (nbot's agent + gh); updated on every rebuild.
system = "${config.skyg.nixos.server.services.nbot-agent.system}";
machines_dir = "/var/lib/machines";
state_dir = "/var/lib/nbot";
agent_cwd = "/root";
idle_timeout = "6h";
max_idle_timeout = "0s";
allow_indefinite = true;
boot_timeout = "2m";
# 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";
# Every agent can use this PAT, so anyone who can prompt one can too.
GH_TOKEN = "$GH_TOKEN";
};
model_providers = [
{
id = "claude-acp";
name = "Claude ACP (Ari Credentials)";
key_env = "CLAUDE_CODE_OAUTH_TOKEN";
models = [ "default" "sonnet" "haiku" "opus" ];
users = [ "U0CBGSS4U6A" ];
}
{
id = "custom_commandcode";
name = "Command Code";
key_env = "COMMAND_CODE_API_KEY";
models = [
"deepseek/deepseek-v4-flash"
"minimax/minimax-m3.1-flash"
"minimaxai/minimax-m3"
"claude-opus-5-5"
"claude-sonnet-5-5"
"claude-haiku-5-5"
"reflection/beam:free"
"moonshotai/kimi-k3"
"moonshotai/kimi-k2.7-code"
"zai-org/glm-5.3"
"z-ai/glm-5.3-flash"
"xai/grok-4.7"
"gpt-6.1-sol"
];
}
];
container = { memory_mb = 4096; cpus = 1.0; };
max_container = { memory_mb = 8192; cpus = 2.0; };
# Leave room for ollama, ds4, comfyui, hermes and the robots.
host_reserve = { memory_mb = 32768; cpus = 4.0; };
storage = { min = "2G"; max = "5G"; limit = "20G"; };
drives = [{ path = homes; reserve = "40G"; }];
cluster = {
node_secrets = { hl-fws1 = "$HL_FWS1_CLUSTER_SECRET"; };
listen = ":${toString ports.cluster}";
};
# Only read on first start; after that, manage permissions from Slack.
permissions = {
managers = [ "U0CBGSS4U6A" ];
default.U0CBGSS4U6A = [ "all" ];
};
};
in
{
age.secrets = lib.genAttrs secrets (name: {
file = skyg-secrets.${name};
owner = "root";
mode = "0400";
});
# nbot flake input; options and docs in its repo.
services.nbot = {
enable = true;
mode = "master";
clusterPort = ports.cluster;
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
};
# The module takes one env file; these add to it.
systemd.services.nbot.serviceConfig.EnvironmentFile =
map (name: config.age.secrets.${name}.path) secrets;
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
}
+30 -27
View File
@@ -48,33 +48,36 @@ let
};
in
{
age.secrets = lib.genAttrs secrets (name: {
file = skyg-secrets.${name};
owner = "root";
mode = "0400";
});
# Off.
config = lib.mkIf false {
age.secrets = lib.genAttrs secrets (name: {
file = skyg-secrets.${name};
owner = "root";
mode = "0400";
});
# slackerbot flake input; options and docs in its repo.
services.slackerbot = {
enable = true;
mode = "master";
clusterPort = ports.cluster;
configFile = (pkgs.formats.toml { }).generate "slackerbot.toml" settings;
# slackerbot flake input; options and docs in its repo.
services.slackerbot = {
enable = true;
mode = "master";
clusterPort = ports.cluster;
configFile = (pkgs.formats.toml { }).generate "slackerbot.toml" settings;
};
# Bazel build server for the containers (16 cores / 32 threads).
skyg.nixos.server.services.bazel-build = {
enable = true;
cpuCount = 32;
cacheGB = 200;
};
# The module takes one env file; these add to it.
systemd.services.slackerbot.serviceConfig.EnvironmentFile =
map (name: config.age.secrets.${name}.path) secrets;
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
};
# Bazel build server for the containers (16 cores / 32 threads).
skyg.nixos.server.services.bazel-build = {
enable = true;
cpuCount = 32;
cacheGB = 200;
};
# The module takes one env file; these add to it.
systemd.services.slackerbot.serviceConfig.EnvironmentFile =
map (name: config.age.secrets.${name}.path) secrets;
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
}
+1 -1
View File
@@ -1,6 +1,6 @@
{ ... }:
{
imports = [ ./slackerbot.nix ];
imports = [ ./slackerbot.nix ./nbot.nix ];
services.pipewire = {
extraConfig.pipewire-pulse."10-raop-discover" = {
+55
View File
@@ -0,0 +1,55 @@
{ config, pkgs, skyg-secrets, ... }:
let
homes = "/var/lib/nbot/homes";
settings = {
# The system each container boots (nbot's agent + gh); updated on every rebuild.
system = "${config.skyg.nixos.server.services.nbot-agent.system}";
machines_dir = "/var/lib/machines";
state_dir = "/var/lib/nbot";
agent_cwd = "/root";
idle_timeout = "6h";
max_idle_timeout = "0s";
allow_indefinite = true;
boot_timeout = "2m";
container = { memory_mb = 4096; cpus = 1.0; };
max_container = { memory_mb = 8192; cpus = 2.0; };
host_reserve = { memory_mb = 8192; cpus = 2.0; };
storage = { min = "2G"; max = "5G"; limit = "20G"; };
drives = [{ path = homes; reserve = "100G"; }];
# Worker of the master on fwdesk. Slack tokens and goose settings come
# from the master. Trusts the first certificate it sees (saved in
# state_dir/master.fingerprint); pin it in master_fingerprint if wanted.
cluster = {
name = "hl-fws1";
master = "wss://fwdesk.lab.internal:7946";
master_fingerprint = "ce08c6b0f3aec855cc8b936d81449c1a34074d181089b26acbdddacfca60af1d";
};
};
in
{
age.secrets.nbot-cluster = {
file = skyg-secrets.nbot-cluster-hl-fws1;
owner = "root";
mode = "0400";
};
# nbot flake input; options and docs in its repo.
services.nbot = {
enable = true;
mode = "slave";
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
environmentFile = config.age.secrets.nbot-cluster.path;
};
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
# networkd only has the container links here (NetworkManager owns wlan),
# so wait-online would always time out.
systemd.network.wait-online.enable = false;
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
}
+32 -29
View File
@@ -1,4 +1,4 @@
{ config, pkgs, skyg-secrets, ... }:
{ config, lib, pkgs, skyg-secrets, ... }:
let
homes = "/var/lib/slackerbot/homes";
bazel = config.skyg.nixos.server.services.bazel-build;
@@ -34,33 +34,36 @@ let
};
in
{
age.secrets.slackerbot-cluster = {
file = skyg-secrets.slackerbot-cluster;
owner = "root";
mode = "0400";
# Off.
config = lib.mkIf false {
age.secrets.slackerbot-cluster = {
file = skyg-secrets.slackerbot-cluster;
owner = "root";
mode = "0400";
};
# slackerbot flake input; options and docs in its repo.
services.slackerbot = {
enable = true;
mode = "slave";
configFile = (pkgs.formats.toml { }).generate "slackerbot.toml" settings;
environmentFile = config.age.secrets.slackerbot-cluster.path;
};
# Bazel build server for the containers (4 cores / 8 threads).
skyg.nixos.server.services.bazel-build = {
enable = true;
cpuCount = 8;
cacheGB = 50;
};
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
# networkd only has the container links here (NetworkManager owns wlan),
# so wait-online would always time out.
systemd.network.wait-online.enable = false;
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
};
# slackerbot flake input; options and docs in its repo.
services.slackerbot = {
enable = true;
mode = "slave";
configFile = (pkgs.formats.toml { }).generate "slackerbot.toml" settings;
environmentFile = config.age.secrets.slackerbot-cluster.path;
};
# Bazel build server for the containers (4 cores / 8 threads).
skyg.nixos.server.services.bazel-build = {
enable = true;
cpuCount = 8;
cacheGB = 50;
};
# Container links belong to systemd-networkd.
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
networking.dhcpcd.denyInterfaces = [ "ve-*" ];
# networkd only has the container links here (NetworkManager owns wlan),
# so wait-online would always time out.
systemd.network.wait-online.enable = false;
systemd.tmpfiles.rules = [ "d ${homes} 0700 root root -" ];
}
+8 -1
View File
@@ -14,6 +14,7 @@ services/
├── bazel-build.nix # skyg.nixos.server.services.bazel-build — NativeLink Bazel build server for slackerbot containers
├── audiobookshelf.nix # skyg.nixos.server.services.audiobookshelf — audiobook/podcast server
├── jellyfin.nix # skyg.nixos.server.services.jellyfin — media server (uid/gid 7777)
├── nbot-agent.nix # skyg.nixos.server.services.nbot-agent — nbot's agent system + gh, for nbot's `system`
├── signal-cli.nix # skyg.nixos.server.services.signal-cli — signal-cli HTTP daemon (Hermes Signal bridge)
├── colibri.nix # skyg.nixos.server.services.colibri — coli serve HTTP API (GLM-5.2/OLMoE local inference)
└── comfyui/ # skyg.nixos.server.services.comfyui — ComfyUI with ROCm/CUDA GPU support
@@ -25,7 +26,8 @@ services/
enables NixOS-native Wyoming faster-whisper + piper. Opens 11434/10200/10300/10400.
- **`bazel-build.nix`** runs NativeLink (from the `nativelink` flake input, pinned
to v1.8.3 because its config format changes) as a remote cache and executor for
slackerbot containers. Used on hl-fws1 and hl-fwdesk. Goal: as little as possible
slackerbot containers. Off on every host: only the disabled slackerbot configs on
hl-fws1 and hl-fwdesk turn it on, and nbot doesn't use it. Goal: as little as possible
runs in a container. Measured on slacker-bot (1 CPU container, 2026-11-01): local
458 s, remote with no cache 65 s, remote with warm cache 17 s.
- NativeLink uses `DynamicUser`, whose state folder systemd mounts `noexec`;
@@ -66,6 +68,10 @@ services/
own `/root/.cache/bazelisk`. Upstream Bazel only runs on NixOS through
`programs.nix-ld`, enabled on the host and in containers. Bump `bazelVersion` and
`bazelSha256` together.
- **`nbot-agent.nix`** adds `gh` to nbot's agent system from this repo, leaving the nbot
repo unchanged. `gh` reads `GH_TOKEN` from `agent_env`, and git over HTTPS to github.com
uses it through `gh`. Every container gets that token (chosen on purpose, 2026-11-03),
so anyone who can prompt an agent can use it or ask it to print the token.
- **`colibri.nix`** runs `coli serve` (colibrì's OpenAI-compatible API) as a native systemd
service. `package` picks the backend (`pkgs.colibri`
cpu / `pkgs.colibri-rocm`); `environmentFile` supplies `COLI_API_KEY` via agenix instead of
@@ -78,6 +84,7 @@ skyg.nixos.server.services.ai.enable
skyg.nixos.server.services.audiobookshelf.{enable,package,configDir,dataDir}
skyg.nixos.server.services.bazel-build.{enable,cpuCount,cacheGB,port,agentSystem,binds}
skyg.nixos.server.services.jellyfin.enable
skyg.nixos.server.services.nbot-agent.system
skyg.nixos.server.services.signal-cli.{enable,host,port,configDir,account,environmentFile,openFirewall}
skyg.nixos.server.services.colibri.{enable,package,model,host,port,environmentFile,openFirewall,...}
skyg.nixos.server.services.comfyui.{enable,mode,port,openFirewall}
@@ -7,6 +7,7 @@
./colibri.nix
./comfyui
./jellyfin.nix
./nbot-agent.nix
./signal-cli.nix
];
}
@@ -0,0 +1,27 @@
# nbot's agent system with our additions. Use it for nbot's `system`.
{ lib, nbot, ... }:
with lib;
let
agentModule = { pkgs, ... }: {
environment.systemPackages = [ pkgs.gh ];
# gh reads GH_TOKEN (from agent_env); git over HTTPS uses it through gh.
programs.git = {
enable = true;
config.credential."https://github.com".helper = "!${pkgs.gh}/bin/gh auth git-credential";
};
};
in
{
options.skyg.nixos.server.services.nbot-agent.system = mkOption {
description = "nbot's agent system with gh added. Use for nbot's `system`.";
readOnly = true;
type = types.package;
default = (nbot.nixosConfigurations.agent.extendModules {
modules = [ agentModule ];
}).config.system.build.toplevel;
# Keeps the manual from building it on every host.
defaultText = literalExpression "nbot agent + gh";
};
}
+6
View File
@@ -38,6 +38,12 @@ in
"secrets/slackerbot-goose.age".publicKeys = [ ari fwdesk ];
"secrets/slackerbot-cluster.age".publicKeys = [ ari fwdesk fws1 ];
# nbot (master on fwdesk, worker on fws1)
"secrets/nbot-slack.age".publicKeys = [ ari fwdesk ];
"secrets/nbot-goose.age".publicKeys = [ ari fwdesk ];
"secrets/nbot-cluster.age".publicKeys = [ ari fwdesk ];
"secrets/nbot-cluster-hl-fws1.age".publicKeys = [ ari fws1 ];
# Buzz stack env (minipc1)
"secrets/buzz-env.age".publicKeys = [ ari minipc1 ];
Binary file not shown.
+7
View File
@@ -0,0 +1,7 @@
age-encryption.org/v1
-> ssh-ed25519 CIR0mA G3Z7tNftUOrNeKCx+aNcIJy2NcviuMqNZ65mvNRntxQ
MDVjN5j5njfKg/Aebgg4qZ2JIV9nyCWmr4H4lXG54YA
-> ssh-ed25519 gzLTww P9jSwj26y9GnXtwapsY9ESzs7cvXkv/WPJ0gDCBu23I
xAp2MX0rkZ9ghXRjDQENUcBydq+bQVgZBKVZXAkKe2w
--- XG3/LPdkXN3P1Byo6GSJ2IKDJ4QhxNln8MVrUsuLSOk
Úw©¶æ^Ê©ž‚pglò¬q9»KdñP„¿oVÃNÏ›ðœ?;ôÇ‚+l²fÈSíÆ3¬è3D­Õ™¥ßÁyY‰£Œ‰g)ù¶Zqê†úMö’‚ЈTA—ù~ 2ñ^QÇ­Þ#@BdŸ¯brµ;šx;Õ
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.