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"]
|
[submodule "assets/compose"]
|
||||||
path = assets/compose
|
path = assets/compose
|
||||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
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"
|
"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-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -37,6 +53,21 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
"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": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -144,6 +175,80 @@
|
|||||||
"type": "github"
|
"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": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705033721,
|
"lastModified": 1705033721,
|
||||||
@@ -176,6 +281,22 @@
|
|||||||
"type": "github"
|
"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": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774386573,
|
"lastModified": 1774386573,
|
||||||
@@ -212,7 +333,10 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||||
|
"nixos-uconsole": "nixos-uconsole",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
|||||||
211
flake.nix
211
flake.nix
@@ -12,10 +12,21 @@
|
|||||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
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
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
@@ -30,57 +41,159 @@
|
|||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
inherit system overlays;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
"openclaw-2026.3.12"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
devShell = import ./shells/nix_dev.nix {
|
devShell = import ./shells/nix_dev.nix {
|
||||||
inherit pkgs system agenix;
|
inherit pkgs system agenix;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
nixosConfigurations = {
|
||||||
nixosConfigurations = {
|
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
specialArgs = { inherit system self keys paths inputs; };
|
||||||
specialArgs = { inherit system self keys paths inputs; };
|
modules = [
|
||||||
modules = [
|
{
|
||||||
{
|
nixpkgs.overlays = overlays;
|
||||||
nixpkgs.overlays = overlays;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.rocmSupport = true;
|
||||||
nixpkgs.config.rocmSupport = true;
|
nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nix.package = lix.packages.${system}.default;
|
||||||
"openclaw-2026.3.12"
|
}
|
||||||
];
|
agenix.nixosModules.default
|
||||||
nix.package = lix.packages.${system}.default;
|
./hosts/lazyworkhorse/configuration.nix
|
||||||
}
|
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||||
agenix.nixosModules.default
|
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||||
./hosts/lazyworkhorse/configuration.nix
|
./modules/nixos/services/docker_manager.nix
|
||||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
./modules/nixos/services/docker_manager.nix
|
./modules/nixos/services/openclaw_node.nix
|
||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./users/gortium.nix
|
||||||
./modules/nixos/services/openclaw_node.nix
|
./users/ai-worker.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 = [
|
||||||
cyt-pi = nixpkgs.lib.nixosSystem {
|
{
|
||||||
specialArgs = { inherit self keys paths inputs; };
|
nixpkgs.overlays = overlays;
|
||||||
modules = [
|
nixpkgs.config.allowUnfree = true;
|
||||||
{
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
nixpkgs.overlays = overlays;
|
nix.package = lix.packages."aarch64-linux".default;
|
||||||
nixpkgs.config.allowUnfree = true;
|
}
|
||||||
nixpkgs.hostPlatform = "aarch64-linux";
|
./hosts/cyt-pi/configuration.nix
|
||||||
nix.package = lix.packages."aarch64-linux".default;
|
./hosts/cyt-pi/hardware-configuration.nix
|
||||||
}
|
];
|
||||||
./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;
|
hoardingcow-mount.enable = true;
|
||||||
|
|
||||||
# Flakesss
|
# 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" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
|
||||||
# Garbage collection
|
# 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,74 +1,64 @@
|
|||||||
# AI Worker Restricted Access
|
# AI Worker Restricted Access
|
||||||
|
|
||||||
This module provides SSH access for the AI worker (hermes-agent) to run docker commands on the host with restrictions.
|
This module provides SSH access for the AI worker (hermes-agent) to run ollama benchmarks on the host.
|
||||||
|
|
||||||
## Security Model
|
## Security Model
|
||||||
|
|
||||||
### Overview
|
The `ai-worker` user has:
|
||||||
|
|
||||||
The `ai-worker` user is a member of the `docker` group, but the `docker` binary is wrapped with a script that **blocks dangerous subcommands** while allowing safe operations.
|
|
||||||
|
|
||||||
### Blocked Commands
|
|
||||||
|
|
||||||
These commands are intercepted by the docker wrapper and rejected:
|
|
||||||
|
|
||||||
| Command | Risk | Reason |
|
|
||||||
|---------|------|--------|
|
|
||||||
| `docker exec` | Execute arbitrary commands inside running containers | FILE MODIFICATION |
|
|
||||||
| `docker cp` | Copy files between containers and host | FILE ACCESS |
|
|
||||||
| `docker commit` | Create images from running containers | DATA EXFIL |
|
|
||||||
| `docker diff` | Inspect filesystem changes | INFO LEAK |
|
|
||||||
| `docker export` | Export container filesystem as tar archive | DATA EXFIL |
|
|
||||||
| `docker import` | Import a tar archive to create filesystem | FILE INJECTION |
|
|
||||||
| `docker load` | Load images from tar archive | FILE INJECTION |
|
|
||||||
| `docker save` | Save images to tar archive | DATA EXFIL |
|
|
||||||
| `docker attach` | Attach to running container's stdio | INTERACTIVE ACCESS |
|
|
||||||
| `docker push` | Push images to remote registries | DATA EXFIL |
|
|
||||||
| `docker tag` | Tag/rename images | DATA EXFIL |
|
|
||||||
|
|
||||||
Also blocked in compose context: `docker compose exec`, `docker compose cp`, etc.
|
|
||||||
|
|
||||||
### Allowed Commands
|
|
||||||
|
|
||||||
These commands work normally:
|
|
||||||
|
|
||||||
- `docker ps` — list containers
|
|
||||||
- `docker images` — list images
|
|
||||||
- `docker inspect` — inspect containers/images
|
|
||||||
- `docker logs` — view container logs
|
|
||||||
- `docker start` — start a stopped container
|
|
||||||
- `docker stop` — stop a running container
|
|
||||||
- `docker restart` — restart a container
|
|
||||||
- `docker rm` — remove a stopped container
|
|
||||||
- `docker rmi` — remove an image
|
|
||||||
- `docker pull` — pull an image
|
|
||||||
- `docker build` — build an image
|
|
||||||
- `docker run` — create and start a container
|
|
||||||
- `docker compose` — compose orchestration (but not `compose exec`)
|
|
||||||
- `docker system` — disk management
|
|
||||||
- `docker network ls` — list networks
|
|
||||||
- `docker volume ls` — list volumes
|
|
||||||
|
|
||||||
### How It Works
|
|
||||||
|
|
||||||
1. A wrapper script intercepts `docker` calls in the user's PATH
|
|
||||||
2. It parses the first non-flag argument to determine the subcommand
|
|
||||||
3. If the subcommand is in the blocklist, it prints an error and exits
|
|
||||||
4. Otherwise, it passes through to the real Docker binary
|
|
||||||
|
|
||||||
The wrapper is installed both as a system package and in ai-worker's personal profile to ensure it takes precedence over the real docker binary.
|
|
||||||
|
|
||||||
### Why Not Use Docker Authorization Plugins?
|
|
||||||
|
|
||||||
Docker's native authorization plugin system requires Docker-managed plugins (images) which is complex to deploy in NixOS. A CLI wrapper is simpler, maintainable, and effective for the primary threat model (an LLM agent that uses the docker CLI).
|
|
||||||
|
|
||||||
Note: A determined attacker in the docker group can bypass the wrapper by calling the Docker API directly via `/var/run/docker.sock`. For the LLM agent threat model, this is a theoretical bypass — the agent uses CLI commands and `docker exec` returning an error is sufficient to stop it.
|
|
||||||
|
|
||||||
### Filesystem Access
|
### Filesystem Access
|
||||||
- **Home directory**: `/home/ai-worker` (standard user home)
|
- **Home directory**: `/home/ai-worker` (standard user home)
|
||||||
- **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
|
- **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
|
||||||
- **Cannot access**: Any files outside standard system paths
|
- **Cannot access**: Any files outside standard system paths
|
||||||
|
|
||||||
|
### Sudo Access
|
||||||
|
- **NONE**: ai-worker has no sudo privileges
|
||||||
|
- Cannot run `nh`, `nixos-rebuild`, `nixpkgs-fmt`, or `nix` with elevated permissions
|
||||||
|
|
||||||
|
### 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
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
# On host, run ollama benchmarks via docker
|
||||||
|
docker exec ollama ollama pull devstral-small-2:24b
|
||||||
|
|
||||||
|
# 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'
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
|
||||||
|
# Check VRAM usage
|
||||||
|
docker exec --privileged ollama rocm-smi --showmeminfo vram
|
||||||
|
|
||||||
|
# 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
|
## SSH Access
|
||||||
|
|
||||||
Connect as:
|
Connect as:
|
||||||
@@ -80,42 +70,32 @@ The working directory will be `/home/ai-worker`. No infra repo access.
|
|||||||
|
|
||||||
## Verification
|
## Verification
|
||||||
|
|
||||||
|
Check ai-worker permissions:
|
||||||
```bash
|
```bash
|
||||||
# Verify wrapper is in PATH
|
# On the host, as root or gortium:
|
||||||
sudo -u ai-worker which docker
|
sudo -u ai-worker sudo -l
|
||||||
# Should show: /home/ai-worker/.nix-profile/bin/docker (wrapped version)
|
# Should show: no sudo access
|
||||||
|
|
||||||
# Test blocked command (should fail)
|
# Check docker group membership
|
||||||
sudo -u ai-worker docker exec ollama ollama list
|
|
||||||
# Expected: ERROR: docker 'exec' is blocked by security policy
|
|
||||||
|
|
||||||
# Test allowed command (should work)
|
|
||||||
sudo -u ai-worker docker ps
|
|
||||||
# Expected: CONTAINER ID IMAGE ...
|
|
||||||
|
|
||||||
# Verify docker group membership
|
|
||||||
groups ai-worker
|
groups ai-worker
|
||||||
# Should show: ai-worker docker
|
# Should show: ai-worker docker
|
||||||
```
|
```
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
If docker commands fail unexpectedly:
|
If ai-worker cannot run docker commands:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check which docker binary is being used
|
# Check docker group membership
|
||||||
which docker
|
groups ai-worker
|
||||||
# If this shows /run/current-system/sw/bin/docker, the wrapper is not in PATH
|
|
||||||
|
|
||||||
# Check if the wrapper is installed
|
# Verify ollama container is running
|
||||||
ls -la $(which docker)
|
docker ps | grep ollama
|
||||||
|
|
||||||
# Verify you're running as the right user
|
# Test docker access
|
||||||
whoami
|
sudo -u ai-worker docker exec ollama ollama list
|
||||||
```
|
```
|
||||||
|
|
||||||
If SSH connection fails:
|
If SSH connection fails:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check SSH key is authorized
|
# Check SSH key is authorized
|
||||||
cat /home/ai-worker/.ssh/authorized_keys
|
cat /home/ai-worker/.ssh/authorized_keys
|
||||||
|
|||||||
@@ -2,123 +2,16 @@
|
|||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
|
||||||
# Docker subcommands that are BLOCKED for ai-worker
|
|
||||||
# These commands allow file modification inside containers or data exfiltration.
|
|
||||||
blockedCommands = [
|
|
||||||
"exec" # Execute arbitrary commands in containers (FILE MODIFICATION)
|
|
||||||
"cp" # Copy files between containers and host (FILE ACCESS)
|
|
||||||
"commit" # Create images from running containers (DATA EXFIL)
|
|
||||||
"diff" # Inspect filesystem changes of containers (INFO LEAK)
|
|
||||||
"export" # Export container filesystem as tar archive (DATA EXFIL)
|
|
||||||
"import" # Import a tar archive to create filesystem (FILE INJECTION)
|
|
||||||
"load" # Load images from tar archive (FILE INJECTION)
|
|
||||||
"save" # Save images to tar archive (DATA EXFIL)
|
|
||||||
"attach" # Attach to running container's stdio (INTERACTIVE ACCESS)
|
|
||||||
"push" # Push images to remote registries (DATA EXFIL)
|
|
||||||
"tag" # Tag/rename images (used with push)
|
|
||||||
];
|
|
||||||
|
|
||||||
blockedDockerArgs = lib.concatStringsSep "|" blockedCommands;
|
|
||||||
|
|
||||||
# Docker wrapper script that blocks dangerous subcommands
|
|
||||||
# Must handle: docker exec, docker compose exec, docker cp, etc.
|
|
||||||
restrictedDockerScript = pkgs.writeShellScriptBin "docker" ''
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Blocklist pattern
|
|
||||||
BLOCKED_PATTERN="^(${blockedDockerArgs})$"
|
|
||||||
|
|
||||||
# Parse the first non-flag argument to find the docker subcommand
|
|
||||||
# Flags: -H, --host, -D, --debug, --config, --context, --log-level, -l
|
|
||||||
# Also handle: docker compose <subcommand> (subcommand may be after 'compose')
|
|
||||||
SUBCOMMAND=""
|
|
||||||
COMPOSE_MODE=false
|
|
||||||
FOUND_ARG=false
|
|
||||||
|
|
||||||
for arg in "$@"; do
|
|
||||||
# Skip flags and their values
|
|
||||||
case "$arg" in
|
|
||||||
-H|--host|-l|--log-level|--config|--context|-D|--debug)
|
|
||||||
FOUND_ARG=true
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
--tls|--tlsverify|--tlscacert|--tlscert|--tlskey)
|
|
||||||
if $FOUND_ARG; then FOUND_ARG=false; else continue; fi
|
|
||||||
;;
|
|
||||||
# Skip flag values (the next arg after a flag that takes a value)
|
|
||||||
-*)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# This is a positional argument — first one is the subcommand (or 'compose')
|
|
||||||
if [ -z "$SUBCOMMAND" ]; then
|
|
||||||
if [ "$arg" = "compose" ]; then
|
|
||||||
COMPOSE_MODE=true
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
SUBCOMMAND="$arg"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
FOUND_ARG=false
|
|
||||||
done
|
|
||||||
|
|
||||||
# If in compose mode, the subcommand is after 'compose'
|
|
||||||
if $COMPOSE_MODE; then
|
|
||||||
# In compose mode, we check the sub-subcommand
|
|
||||||
NEXT_GOT=""
|
|
||||||
for arg in "$@"; do
|
|
||||||
if [ "$NEXT_GOT" = "true" ]; then
|
|
||||||
if echo "$arg" | grep -qE "$BLOCKED_PATTERN"; then
|
|
||||||
echo "ERROR: docker compose '$arg' is blocked by security policy" >&2
|
|
||||||
echo "This command can modify files inside containers." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
if [ "$arg" = "compose" ]; then
|
|
||||||
NEXT_GOT="true"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if the subcommand is blocked
|
|
||||||
if [ -n "$SUBCOMMAND" ]; then
|
|
||||||
if echo "$SUBCOMMAND" | grep -qE "$BLOCKED_PATTERN"; then
|
|
||||||
echo "ERROR: docker '$SUBCOMMAND' is blocked by security policy" >&2
|
|
||||||
echo "This command can modify files inside containers." >&2
|
|
||||||
echo "" >&2
|
|
||||||
echo "Allowed commands: ps, images, inspect, logs, start, stop, restart," >&2
|
|
||||||
echo " rm, rmi, pull, build, run, compose, system, network ls, volume ls" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Execute the real docker binary
|
|
||||||
exec ${pkgs.docker}/bin/docker "$@"
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
options.services.aiWorkerAccess = mkOption {
|
options.services.aiWorkerAccess = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = "Enable AI worker SSH access with restricted docker commands";
|
description = "Enable AI worker SSH access with docker group membership for ollama benchmarking";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf config.services.aiWorkerAccess {
|
config = mkIf config.services.aiWorkerAccess {
|
||||||
# ai-worker is in docker group for normal docker operations
|
# 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" ];
|
users.groups.docker.members = [ "ai-worker" ];
|
||||||
|
|
||||||
# Install the docker wrapper for ai-worker
|
|
||||||
# This puts a filtered 'docker' script in ai-worker's PATH that blocks
|
|
||||||
# dangerous commands like exec, cp, commit, etc.
|
|
||||||
# The real docker binary is still available at its store path, but the
|
|
||||||
# wrapper intercepts it because ~/.nix-profile/bin/ comes before /run/.../sw/bin/ in PATH.
|
|
||||||
users.users.ai-worker.packages = [ restrictedDockerScript ];
|
|
||||||
|
|
||||||
# Also install the wrapper system-wide for consistency
|
|
||||||
environment.systemPackages = [ restrictedDockerScript ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
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;
|
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||||
|
"home_wifi.age".publicKeys = authorizedKeys;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
group = "ai-worker";
|
group = "ai-worker";
|
||||||
home = "/home/ai-worker";
|
home = "/home/ai-worker";
|
||||||
createHome = true;
|
createHome = true;
|
||||||
# ai-worker stays in docker group for normal docker operations (ps, start, stop, compose, ...)
|
|
||||||
# Dangerous commands (exec, cp, commit) are blocked by a wrapper script.
|
|
||||||
extraGroups = [ "docker" ];
|
extraGroups = [ "docker" ];
|
||||||
shell = pkgs.bashInteractive;
|
shell = pkgs.bashInteractive;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
@@ -16,14 +14,17 @@
|
|||||||
};
|
};
|
||||||
users.groups.ai-worker = {};
|
users.groups.ai-worker = {};
|
||||||
|
|
||||||
# Enable restricted AI worker SSH access
|
# Enable restricted AI worker SSH access for ollama benchmarking
|
||||||
# SECURITY: ai-worker is in docker group but docker commands are filtered:
|
# SECURITY: ai-worker can only:
|
||||||
# ALLOWED: ps, images, logs, start, stop, restart, rm, rmi, pull, build, run, compose
|
# - SSH into host from Hermes container
|
||||||
# BLOCKED: exec, cp, commit, diff, export, import, load, save, attach, push
|
# - Run docker commands (docker exec ollama ...) via docker group
|
||||||
# The filtering is done by a docker wrapper in ai-worker's PATH.
|
# - Run specific security audit commands
|
||||||
|
# - NO access to infra repo (no bind mount)
|
||||||
|
# - 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;
|
services.aiWorkerAccess = true;
|
||||||
|
|
||||||
# Restricted sudo for ai-worker - security checks only (not for docker)
|
# Restricted sudo for ai-worker - security checks only
|
||||||
security.sudo.extraRules = [
|
security.sudo.extraRules = [
|
||||||
{
|
{
|
||||||
users = [ "ai-worker" ];
|
users = [ "ai-worker" ];
|
||||||
@@ -68,6 +69,15 @@
|
|||||||
command = "/run/current-system/sw/bin/sshd -T";
|
command = "/run/current-system/sw/bin/sshd -T";
|
||||||
options = [ "NOPASSWD" ];
|
options = [ "NOPASSWD" ];
|
||||||
}
|
}
|
||||||
|
# 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
|
# Network diagnostics
|
||||||
{
|
{
|
||||||
command = "/run/current-system/sw/bin/ss -tlnp";
|
command = "/run/current-system/sw/bin/ss -tlnp";
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{ pkgs, inputs, config, keys, ... }: {
|
{ pkgs, inputs, config, keys, ... }: {
|
||||||
|
home-manager.users.gortium = import ./home.nix;
|
||||||
users.users.gortium = {
|
users.users.gortium = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
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