Compare commits
45 Commits
feat/restr
...
cbcabe89b6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbcabe89b6 | ||
|
|
7523a38be3 | ||
|
|
86a4daacbb | ||
|
|
723e5b1736 | ||
|
|
0bdf18ef12 | ||
|
|
91c6b4f2a7 | ||
|
|
ab22f85105 | ||
|
|
e498823ab6 | ||
|
|
0672c26897 | ||
|
|
521829c487 | ||
|
|
0e2f15a803 | ||
|
|
7511fd24bb | ||
| 4610a08072 | |||
| 3f985c72de | |||
| 6543de3a45 | |||
| 0db8071300 | |||
| 9038863728 | |||
| 7e3b2520eb | |||
| 80efb68428 | |||
| 3d86af76b9 | |||
| 656570b39e | |||
| 8b6990ceee | |||
| a312c29221 | |||
| 053dd535d3 | |||
| 35e4155b8c | |||
| e8218c322a | |||
| 931ed2ac27 | |||
| 052081616c | |||
| d3d7cdff44 | |||
| 5202bc1fcb | |||
| 9319e32683 | |||
| 7da46d5769 | |||
| 8ea6be7ac1 | |||
| b455bf6866 | |||
| ce7c594562 | |||
| eb5e64ec67 | |||
| ec44012a64 | |||
| 16acc6a153 | |||
| 5ee644e9dd | |||
| efc50d23c4 | |||
| a527b65eae | |||
| 698d3f91eb | |||
| 1f99ca0d37 | |||
| 869d3957b5 | |||
| 2eaffa8cfb |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +1,6 @@
|
||||
[submodule "assets/compose"]
|
||||
path = assets/compose
|
||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
||||
[submodule "assets/dotfiles"]
|
||||
path = assets/dotfiles
|
||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/dotfiles.git
|
||||
|
||||
Submodule assets/compose updated: d3f2e3b7b9...3c92d93366
126
flake.lock
generated
126
flake.lock
generated
@@ -23,6 +23,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"argononed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729566243,
|
||||
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
|
||||
"owner": "nvmd",
|
||||
"repo": "argononed",
|
||||
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nvmd",
|
||||
"repo": "argononed",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -37,6 +53,21 @@
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -144,6 +175,80 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-images": {
|
||||
"inputs": {
|
||||
"nixos-stable": [
|
||||
"nixos-raspberrypi",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixos-unstable": [
|
||||
"nixos-raspberrypi",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747747741,
|
||||
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
|
||||
"owner": "nvmd",
|
||||
"repo": "nixos-images",
|
||||
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nvmd",
|
||||
"ref": "sdimage-installer",
|
||||
"repo": "nixos-images",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-raspberrypi": {
|
||||
"inputs": {
|
||||
"argononed": "argononed",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixos-images": "nixos-images",
|
||||
"nixpkgs": [
|
||||
"nixpkgs-uconsole"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781324200,
|
||||
"narHash": "sha256-JWqxN2Yle86+4Q+GFh12SvB92ZyLeqalVsN9lfMh6eQ=",
|
||||
"owner": "gortium",
|
||||
"repo": "nixos-raspberrypi",
|
||||
"rev": "721a6e9e67dca3a23133db650b87018646bca3e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gortium",
|
||||
"ref": "cm5-cross-v1",
|
||||
"repo": "nixos-raspberrypi",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-uconsole": {
|
||||
"inputs": {
|
||||
"nixos-raspberrypi": [
|
||||
"nixos-raspberrypi"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs-uconsole"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781476310,
|
||||
"narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
|
||||
"owner": "gortium",
|
||||
"repo": "nixos-uconsole",
|
||||
"rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gortium",
|
||||
"ref": "pr/dcs-panel-detection",
|
||||
"repo": "nixos-uconsole",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
@@ -176,6 +281,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-uconsole": {
|
||||
"locked": {
|
||||
"lastModified": 1780952837,
|
||||
"narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1774386573,
|
||||
@@ -212,7 +333,10 @@
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"lix": "lix",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||
"nixos-uconsole": "nixos-uconsole",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
||||
211
flake.nix
211
flake.nix
@@ -12,10 +12,21 @@
|
||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
self.submodules = true;
|
||||
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixos-uconsole = {
|
||||
url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
|
||||
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||
inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
|
||||
};
|
||||
nixos-raspberrypi = {
|
||||
url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
|
||||
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
|
||||
outputs = { self, nixpkgs, agenix, lix
|
||||
, nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
|
||||
, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
keys = import ./lib/keys.nix;
|
||||
@@ -30,57 +41,159 @@
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"openclaw-2026.3.12"
|
||||
];
|
||||
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||
};
|
||||
|
||||
devShell = import ./shells/nix_dev.nix {
|
||||
inherit pkgs system agenix;
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit system self keys paths inputs; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"openclaw-2026.3.12"
|
||||
];
|
||||
nix.package = lix.packages.${system}.default;
|
||||
}
|
||||
agenix.nixosModules.default
|
||||
./hosts/lazyworkhorse/configuration.nix
|
||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||
./modules/nixos/services/docker_manager.nix
|
||||
./modules/nixos/services/open_code_server.nix
|
||||
./modules/nixos/services/ollama_init_custom_models.nix
|
||||
./modules/nixos/services/openclaw_node.nix
|
||||
./modules/nixos/security/ai-worker-restricted.nix
|
||||
./users/gortium.nix
|
||||
./users/ai-worker.nix
|
||||
];
|
||||
};
|
||||
|
||||
cyt-pi = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit self keys paths inputs; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nix.package = lix.packages."aarch64-linux".default;
|
||||
}
|
||||
./hosts/cyt-pi/configuration.nix
|
||||
./hosts/cyt-pi/hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit system self keys paths inputs; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||
nix.package = lix.packages.${system}.default;
|
||||
}
|
||||
agenix.nixosModules.default
|
||||
./hosts/lazyworkhorse/configuration.nix
|
||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||
./modules/nixos/services/docker_manager.nix
|
||||
./modules/nixos/services/open_code_server.nix
|
||||
./modules/nixos/services/ollama_init_custom_models.nix
|
||||
./modules/nixos/services/openclaw_node.nix
|
||||
./modules/nixos/security/ai-worker-restricted.nix
|
||||
./users/gortium.nix
|
||||
./users/ai-worker.nix
|
||||
];
|
||||
};
|
||||
|
||||
cyt-pi = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit self keys paths inputs; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nix.package = lix.packages."aarch64-linux".default;
|
||||
}
|
||||
./hosts/cyt-pi/configuration.nix
|
||||
./hosts/cyt-pi/hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
|
||||
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = {
|
||||
inherit self keys paths inputs;
|
||||
nixos-raspberrypi = nixos-raspberrypi;
|
||||
isCM4 = false;
|
||||
};
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.buildPlatform = "x86_64-linux";
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||
# Kill camera packages — not needed on uConsole, break cross-compile
|
||||
nixpkgs.overlays = [
|
||||
# Make camera packages "unavailable" so no pkgs depend on them
|
||||
(final: prev: {
|
||||
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
|
||||
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
|
||||
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
|
||||
# Pipewire in nixos-25.11 has libcamera unconditionally in buildInputs;
|
||||
# meta.platforms trick doesn't help — must actually remove it
|
||||
pipewire = prev.pipewire.overrideAttrs (old: {
|
||||
buildInputs = builtins.filter
|
||||
(x: !(x?pname && x.pname == "libcamera"))
|
||||
(old.buildInputs or []);
|
||||
mesonFlags = builtins.filter
|
||||
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
||||
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
||||
});
|
||||
# gjs cross-compile fails without GTK; skip intro tests
|
||||
gjs = prev.gjs.overrideAttrs (old: {
|
||||
mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
|
||||
});
|
||||
# Qt6Quick missing from aarch64 qtdeclarative cross-compile;
|
||||
# skip qtutils runtime deps — Hyprland only needs it for QML UI
|
||||
hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
|
||||
# hyprwayland-scanner not found by cross pkg-config wrapper
|
||||
xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
|
||||
preConfigure = (old.preConfigure or "") + ''
|
||||
# Point cmake to the correct hyprwayland-scanner pkgconfig
|
||||
cmakeFlags="$cmakeFlags -Dhyprwayland-scanner_DIR=${prev.buildPackages.hyprwayland-scanner}/lib/cmake/hyprwayland-scanner" 2>/dev/null || true
|
||||
export PKG_CONFIG_PATH="${prev.buildPackages.hyprwayland-scanner}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
'';
|
||||
});
|
||||
})
|
||||
];
|
||||
}
|
||||
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
||||
# Disable libcamera in rpi pipewire too (separate nixpkgs instance)
|
||||
({ config, lib, pkgs, ... }: {
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
pipewire = prev.pipewire.overrideAttrs (old: {
|
||||
buildInputs = builtins.filter
|
||||
(x: !(x?pname && x.pname == "libcamera"))
|
||||
(old.buildInputs or []);
|
||||
mesonFlags = builtins.filter
|
||||
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
||||
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
||||
});
|
||||
})
|
||||
];
|
||||
})
|
||||
|
||||
# Patches are now in gortium/nixos-uconsole fork (pr/dcs-panel-detection branch)
|
||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||
nixos-raspberrypi.lib.inject-overlays
|
||||
nixos-raspberrypi.lib.inject-overlays-global
|
||||
nixos-uconsole.nixosModules.uconsole-cm5
|
||||
({ config, lib, pkgs, inputs, ... }: let
|
||||
lix-cross = import inputs.nixpkgs-uconsole {
|
||||
localSystem = { system = "x86_64-linux"; };
|
||||
crossSystem = { system = "aarch64-linux"; };
|
||||
overlays = [ inputs.lix.overlays.default ];
|
||||
};
|
||||
in { nix.package = lix-cross.lix; })
|
||||
agenix.nixosModules.default
|
||||
./hosts/uconsole-cm5/configuration.nix
|
||||
./hosts/uconsole-cm5/hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
devShells.${system}.default = devShell;
|
||||
};
|
||||
|
||||
devShells.${system}.default = devShell;
|
||||
|
||||
packages.${system} = {
|
||||
uconsole-cm5-image = (nixos-raspberrypi.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = {
|
||||
inherit self keys inputs;
|
||||
nixos-raspberrypi = nixos-raspberrypi;
|
||||
isCM4 = false;
|
||||
};
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.buildPlatform = system;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
}
|
||||
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||
nixos-raspberrypi.lib.inject-overlays-global
|
||||
nixos-raspberrypi.nixosModules.sd-image
|
||||
nixos-uconsole.nixosModules.uconsole-cm5
|
||||
agenix.nixosModules.default
|
||||
./hosts/uconsole-cm5/configuration.nix
|
||||
];
|
||||
}).config.system.build.sdImage;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
hoardingcow-mount.enable = true;
|
||||
|
||||
# Flakesss
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
|
||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||
|
||||
# Garbage collection
|
||||
|
||||
36
hosts/uconsole-cm5/configuration.nix
Normal file
36
hosts/uconsole-cm5/configuration.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{ config, lib, pkgs, keys, ... }:
|
||||
|
||||
{
|
||||
networking.hostName = "uConsole";
|
||||
time.timeZone = "America/Montreal";
|
||||
i18n.defaultLocale = "en_CA.UTF-8";
|
||||
system.stateVersion = "25.11";
|
||||
|
||||
# SSH — root access avec clés gortium + ai-worker
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PermitRootLogin = lib.mkForce "prohibit-password";
|
||||
PasswordAuthentication = lib.mkForce false;
|
||||
};
|
||||
};
|
||||
|
||||
users.users.root.openssh.authorizedKeys.keys = with keys; [
|
||||
users.gortium.main
|
||||
users.ai-worker.main
|
||||
];
|
||||
|
||||
# WiFi via NetworkManager + secret agenix
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Firmware
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
# Hyprland Wayland compositor (manual start — no SDDM)
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
# SD card partitions (nixos-uconsole layout)
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/NIXOS_SD";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot/firmware" = {
|
||||
device = "/dev/disk/by-label/FIRMWARE";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||
}
|
||||
@@ -1,44 +1,10 @@
|
||||
# AI Worker Restricted Access
|
||||
|
||||
This module provides SSH access for the AI worker (hermes-agent) to run docker commands on the host.
|
||||
This module provides SSH access for the AI worker (hermes-agent) to run ollama benchmarks on the host.
|
||||
|
||||
## Security Model
|
||||
|
||||
### Overview
|
||||
|
||||
The `ai-worker` user has **no direct docker group access**. All docker commands must go through `sudo`, and only specific subcommands are whitelisted:
|
||||
|
||||
- **Container lifecycle**: `docker ps`, `docker inspect`, `docker logs`, `docker images`, `docker info`, `docker version`, `docker stats`
|
||||
- **Control**: `docker start`, `docker stop`, `docker restart`, `docker rm`, `docker rmi`, `docker wait`
|
||||
- **Image management**: `docker pull`, `docker build`, `docker run`, `docker compose`
|
||||
- **Disk cleanup**: `docker system`
|
||||
- **Network/Volume**: `docker network ls`, `docker volume ls` (read-only)
|
||||
|
||||
### EXPLICITLY BLOCKED (not in sudo whitelist)
|
||||
|
||||
| Command | Risk | Result |
|
||||
|---------|------|--------|
|
||||
| `docker exec` | Execute arbitrary commands inside containers (FILE MODIFICATION) | Blocked by sudo |
|
||||
| `docker cp` | Copy files between containers and host | Blocked by sudo |
|
||||
| `docker commit` | Create images from running containers (data exfil) | Blocked by sudo |
|
||||
| `docker diff` | Inspect filesystem changes | Blocked by sudo |
|
||||
| `docker export` | Export container filesystem | Blocked by sudo |
|
||||
| `docker import` | Import filesystem archives | Blocked by sudo |
|
||||
| `docker load` | Load docker images | Blocked by sudo |
|
||||
| `docker save` | Save docker images to tar | Blocked by sudo |
|
||||
| `docker attach` | Interactive access to containers | Blocked by sudo |
|
||||
| `docker push` | Push images to registries | Blocked by sudo |
|
||||
| `docker tag` | Rename images | Blocked by sudo |
|
||||
|
||||
### Why This Approach?
|
||||
|
||||
Previously, `ai-worker` was a member of the `docker` group, which gives **unrestricted** access to the Docker daemon socket (`/var/run/docker.sock`). Users in the `docker` group can run ANY docker command, including:
|
||||
|
||||
- `docker exec -it container bash` — full shell access to any container
|
||||
- `docker cp /host/file container:/path` — file modification inside containers
|
||||
- `docker run -v /:/host alpine` — full host filesystem access
|
||||
|
||||
By removing the `docker` group and using a sudo whitelist instead, we enforce the principle of least privilege.
|
||||
The `ai-worker` user has:
|
||||
|
||||
### Filesystem Access
|
||||
- **Home directory**: `/home/ai-worker` (standard user home)
|
||||
@@ -46,33 +12,51 @@ By removing the `docker` group and using a sudo whitelist instead, we enforce th
|
||||
- **Cannot access**: Any files outside standard system paths
|
||||
|
||||
### Sudo Access
|
||||
- **Restricted**: ai-worker has `NOPASSWD` access only to whitelisted commands
|
||||
- **NONE**: ai-worker has no sudo privileges
|
||||
- Cannot run `nh`, `nixos-rebuild`, `nixpkgs-fmt`, or `nix` with elevated permissions
|
||||
|
||||
## Workflow: SSH + Restricted Docker
|
||||
### Docker Access
|
||||
- Member of `docker` group - can run `docker` and `docker exec` commands
|
||||
- Primary use: `docker exec ollama ollama ...` for benchmarking
|
||||
- Can run `docker exec --privileged ollama rocm-smi ...` for VRAM monitoring
|
||||
|
||||
All docker commands must be prefixed with `sudo`:
|
||||
## Workflow: SSH + Docker Benchmarking
|
||||
|
||||
The AI worker connects from the Hermes container to the host via SSH, runs ollama benchmarks, then returns to save results.
|
||||
|
||||
### Example Workflow
|
||||
|
||||
```bash
|
||||
# From Hermes container, SSH to host
|
||||
ssh -i /path/to/ssh/key ai-worker@host.docker.internal
|
||||
|
||||
# Check container status (works)
|
||||
sudo docker ps
|
||||
# On host, run ollama benchmarks via docker
|
||||
docker exec ollama ollama pull devstral-small-2:24b
|
||||
|
||||
# Restart a container (works)
|
||||
sudo docker restart ollama
|
||||
# Create test modelfile
|
||||
docker exec ollama bash -c 'cat <<EOF > /root/.ollama/test.modelfile
|
||||
FROM devstral-small-2:24b
|
||||
PARAMETER num_ctx 65536
|
||||
PARAMETER num_gpu 99
|
||||
PARAMETER flash_attn true
|
||||
EOF'
|
||||
|
||||
# Run benchmark (works - docker run is allowed)
|
||||
sudo docker run --rm alpine echo "test"
|
||||
# Create and test model
|
||||
docker exec ollama ollama create test-model -f /root/.ollama/test.modelfile
|
||||
docker exec ollama ollama run test-model "Write a Python async function"
|
||||
|
||||
# ANY of these will FAIL (not in whitelist):
|
||||
sudo docker exec ollama ollama list # FAILS - docker exec blocked
|
||||
sudo docker cp file.txt container:/path/ # FAILS - docker cp blocked
|
||||
sudo docker commit container new-image # FAILS - docker commit blocked
|
||||
# Check VRAM usage
|
||||
docker exec --privileged ollama rocm-smi --showmeminfo vram
|
||||
|
||||
# For ollama operations, use the HTTP API instead of docker exec:
|
||||
curl http://ollama:11434/api/tags
|
||||
# Cleanup
|
||||
docker exec ollama ollama rm test-model
|
||||
|
||||
# Exit SSH, return to Hermes container
|
||||
exit
|
||||
|
||||
# Save results in Hermes container
|
||||
# /opt/data/ai-optimizer/state.json
|
||||
# /opt/data/ai-optimizer/results.csv
|
||||
```
|
||||
|
||||
## SSH Access
|
||||
@@ -90,30 +74,25 @@ Check ai-worker permissions:
|
||||
```bash
|
||||
# On the host, as root or gortium:
|
||||
sudo -u ai-worker sudo -l
|
||||
# Should show the whitelisted commands only (no docker exec/cp/commit)
|
||||
# Should show: no sudo access
|
||||
|
||||
# Verify NOT in docker group
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
# Should show: ai-worker (NO docker group)
|
||||
# Should show: ai-worker docker
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
If docker commands fail:
|
||||
|
||||
If ai-worker cannot run docker commands:
|
||||
```bash
|
||||
# Check sudo permissions
|
||||
sudo -u ai-worker sudo -l | grep docker
|
||||
|
||||
# Verify group membership
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
|
||||
# Test allowed command
|
||||
sudo -u ai-worker sudo docker ps
|
||||
# Verify ollama container is running
|
||||
docker ps | grep ollama
|
||||
|
||||
# Test blocked command (should fail)
|
||||
sudo -u ai-worker sudo docker exec ollama ollama list
|
||||
# Expected: "Sorry, user ai-worker is not allowed to execute"
|
||||
# Test docker access
|
||||
sudo -u ai-worker docker exec ollama ollama list
|
||||
```
|
||||
|
||||
If SSH connection fails:
|
||||
|
||||
@@ -6,19 +6,12 @@ with lib;
|
||||
options.services.aiWorkerAccess = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable AI worker SSH access with restricted sudo docker commands";
|
||||
description = "Enable AI worker SSH access with docker group membership for ollama benchmarking";
|
||||
};
|
||||
|
||||
config = mkIf config.services.aiWorkerAccess {
|
||||
# SECURITY: ai-worker is NOT added to docker group.
|
||||
# Docker access is granted via sudo whitelist in users/ai-worker.nix.
|
||||
# This prevents unrestricted docker daemon access (docker exec, cp, commit, etc.)
|
||||
# Only specific docker subcommands are allowed via sudo NOPASSWD rules.
|
||||
|
||||
# The old approach (docker group membership) has been removed because:
|
||||
# - Docker group gives UNRESTRICTED access to the docker daemon socket
|
||||
# - No way to limit which docker subcommands a docker group member can run
|
||||
# - Allowed: docker exec, docker cp, docker run -v /:/host, etc.
|
||||
# users.groups.docker.members = [ "ai-worker" ]; // REMOVED
|
||||
# ai-worker is member of docker group - can run docker commands via SSH
|
||||
# No bind mounts, no sudo access - docker-only for ollama benchmarking
|
||||
users.groups.docker.members = [ "ai-worker" ];
|
||||
};
|
||||
}
|
||||
|
||||
6
modules/nixos/services/default.nix
Normal file
6
modules/nixos/services/default.nix
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
imports = [
|
||||
./dotfiles.nix
|
||||
./systemd
|
||||
];
|
||||
}
|
||||
69
modules/nixos/services/dotfiles.nix
Normal file
69
modules/nixos/services/dotfiles.nix
Normal file
@@ -0,0 +1,69 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.dotfiles;
|
||||
stowDir = cfg.stowDir;
|
||||
|
||||
# Function to recursively find all files in a directory
|
||||
findFiles = dir:
|
||||
let
|
||||
files = builtins.attrNames (builtins.readDir dir);
|
||||
in
|
||||
concatMap (name:
|
||||
let
|
||||
path = dir + "/${name}";
|
||||
in
|
||||
if (builtins.typeOf (builtins.readDir path) == "set")
|
||||
then findFiles path
|
||||
else [ path ]
|
||||
) files;
|
||||
|
||||
# Get a list of all packages (directories) in the stow directory
|
||||
stowPackages = builtins.attrNames (builtins.readDir stowDir);
|
||||
|
||||
# Create an attribute set where each attribute is a package name
|
||||
# and the value is a list of files to be linked.
|
||||
homeManagerLinks = listToAttrs (map (pkg:
|
||||
let
|
||||
pkgPath = stowDir + "/${pkg}";
|
||||
files = findFiles pkgPath;
|
||||
in
|
||||
nameValuePair pkg (map (file: {
|
||||
source = file;
|
||||
target = removePrefix (pkgPath + "/") file;
|
||||
}) files)
|
||||
) stowPackages);
|
||||
|
||||
in
|
||||
{
|
||||
options.services.dotfiles = {
|
||||
enable = mkEnableOption "Enable dotfiles management";
|
||||
|
||||
stowDir = mkOption {
|
||||
type = types.path;
|
||||
description = "The directory where your stow packages are located.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
description = "The user to manage dotfiles for.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${cfg.user} = {
|
||||
home.file =
|
||||
let
|
||||
allFiles = concatLists (attrValues homeManagerLinks);
|
||||
in
|
||||
listToAttrs (map (file:
|
||||
nameValuePair file.target {
|
||||
source = file.source;
|
||||
}
|
||||
) allFiles);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
10
secrets/home_wifi.age
Normal file
10
secrets/home_wifi.age
Normal file
@@ -0,0 +1,10 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
|
||||
YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
|
||||
V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
|
||||
Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
|
||||
aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
|
||||
cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
|
||||
TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
|
||||
KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
@@ -11,4 +11,5 @@ in
|
||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||
"home_wifi.age".publicKeys = authorizedKeys;
|
||||
}
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
group = "ai-worker";
|
||||
home = "/home/ai-worker";
|
||||
createHome = true;
|
||||
# SECURITY: ai-worker is NOT in the docker group.
|
||||
# Docker access is restricted via sudo whitelist — only specific subcommands allowed.
|
||||
# extraGroups = [ "docker" ]; — REMOVED: docker group gives unrestricted docker daemon access
|
||||
extraGroups = [ "docker" ];
|
||||
shell = pkgs.bashInteractive;
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.ai-worker.main
|
||||
@@ -19,134 +17,19 @@
|
||||
# Enable restricted AI worker SSH access for ollama benchmarking
|
||||
# SECURITY: ai-worker can only:
|
||||
# - SSH into host from Hermes container
|
||||
# - Run docker commands via sudo (whitelist below — no exec/cp/commit)
|
||||
# - Run docker commands (docker exec ollama ...) via docker group
|
||||
# - Run specific security audit commands
|
||||
# - NO access to infra repo (no bind mount)
|
||||
# - NO nix/nixos-rebuild/nh commands
|
||||
# WORKFLOW: SSH from Hermes container, run docker commands via sudo, return and save results
|
||||
# - NO sudo access (no nh, nixos-rebuild, nixpkgs-fmt, nix)
|
||||
# WORKFLOW: SSH from Hermes container, run docker benchmarks, return and save results to /opt/data/ai-optimizer/
|
||||
services.aiWorkerAccess = true;
|
||||
|
||||
# Restricted sudo for ai-worker
|
||||
# IMPORTANT: ai-worker is NOT in docker group. All docker access goes through sudo.
|
||||
# Only the subcommands listed below are allowed — everything else is denied.
|
||||
# This prevents: docker exec, docker cp, docker commit, and other file-modifying operations.
|
||||
|
||||
# Restricted sudo for ai-worker - security checks only
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "ai-worker" ];
|
||||
commands = [
|
||||
# === Docker commands: lifecycle management (NO file modification) ===
|
||||
# ps/inspect/logs — read-only status checks
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker ps";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker inspect *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker logs *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker images";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker info";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker version";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker stats *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# start/stop/restart — container lifecycle
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker start *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker stop *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker restart *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker rm *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker rmi *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker wait *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# pull/build/run — image management and container creation
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker pull *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker build *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker run *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# compose — orchestration
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker compose *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# system — disk cleanup
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker system *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# network — list only (create/modify not needed)
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker network ls";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# volume — list only (create/modify not needed)
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker volume ls";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# === EXPLICITLY DENIED docker commands (not in whitelist — sudo rejects them) ===
|
||||
# docker exec — executes arbitrary commands inside running containers (FILE MODIFICATION)
|
||||
# docker cp — copies files between containers and host (FILE ACCESS)
|
||||
# docker commit — creates images from running containers (DATA EXFIL)
|
||||
# docker diff — inspects filesystem changes (INFO LEAK)
|
||||
# docker export — exports container filesystem (DATA EXFIL)
|
||||
# docker import — imports filesystem archives
|
||||
# docker load — loads docker images
|
||||
# docker save — saves docker images to tar (DATA EXFIL)
|
||||
# docker attach — attaches to running containers (INTERACTIVE ACCESS)
|
||||
# docker push — pushes images to registries (DATA EXFIL)
|
||||
# docker tag — renames images
|
||||
# docker create — creates containers (use 'docker run' instead)
|
||||
# docker plugin — manages plugins
|
||||
# docker network create/rm — network management
|
||||
# docker volume create/rm — volume management
|
||||
|
||||
# === Firewall checks ===
|
||||
# Firewall checks
|
||||
{
|
||||
command = "/run/wrappers/bin/sudo iptables -L -n -v";
|
||||
options = [ "NOPASSWD" ];
|
||||
@@ -155,8 +38,7 @@
|
||||
command = "/run/wrappers/bin/sudo iptables -S";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# === Fail2ban status ===
|
||||
# Fail2ban status
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client status";
|
||||
options = [ "NOPASSWD" ];
|
||||
@@ -169,8 +51,7 @@
|
||||
command = "/run/current-system/sw/bin/fail2ban-client get * banned";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# === Log inspection ===
|
||||
# Log inspection
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -t kernel -n 100";
|
||||
options = [ "NOPASSWD" ];
|
||||
@@ -183,14 +64,21 @@
|
||||
command = "/run/current-system/sw/bin/journalctl -u firewall -n 50";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# === SSH config verification ===
|
||||
# SSH config verification
|
||||
{
|
||||
command = "/run/current-system/sw/bin/sshd -T";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
|
||||
# === Network diagnostics ===
|
||||
# Docker service checks
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker ps";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker inspect *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Network diagnostics
|
||||
{
|
||||
command = "/run/current-system/sw/bin/ss -tlnp";
|
||||
options = [ "NOPASSWD" ];
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
home-manager.users.gortium = import ./home.nix;
|
||||
users.users.gortium = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
||||
12
users/gortium/home.nix
Normal file
12
users/gortium/home.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
{ pkgs, ... }: {
|
||||
services.dotfiles = {
|
||||
enable = true;
|
||||
stowDir = ../../../assets/dotfiles;
|
||||
user = "gortium";
|
||||
};
|
||||
|
||||
home.username = "gortium";
|
||||
home.homeDirectory = "/home/gortium";
|
||||
home.stateVersion = "23.11"; # Please change this to your version.
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
Reference in New Issue
Block a user