Merge feat/remote-builders into uconsole-cm5-incremental
Bidirectional remote building + rename uconsole-cm5 -> uConsole: - Rename all uconsole-cm5 refs to uConsole (nixosSystem key, paths, module) - Replace single-machine remote-builder module with multi-machine config - Enable remote builder on lazyworkhorse -> uConsole (aarch64) - Enable remote builder on uConsole -> lazyworkhorse (x86_64) - Add builder system user + SSH key via agenix-rekey (secrets/builder_key.age) - Add builder_key + gortium_password age secrets to all hosts - Fix pre-existing bugs: missing modules in lazyworkhorse/cyt-pi, SSH config structure (hostKeys outside settings), cyt-pi inline user - Remove obsolete openclaw-node service + module + age secrets
This commit is contained in:
16
flake.nix
16
flake.nix
@@ -57,6 +57,7 @@
|
||||
inherit pkgs system agenix;
|
||||
};
|
||||
|
||||
|
||||
##############################################################################
|
||||
# CROSS-COMPILE WORKAROUNDS — packages that fail aarch64 cross-compile
|
||||
#
|
||||
@@ -227,7 +228,7 @@
|
||||
nixos-raspberrypi.lib.inject-overlays
|
||||
nixos-raspberrypi.lib.inject-overlays-global
|
||||
nixos-uconsole.nixosModules.uconsole-cm5
|
||||
./modules/nixos/hardware/uconsole-cm5-aio-v2.nix
|
||||
./modules/nixos/hardware/uConsole-aio-v2.nix
|
||||
({ config, lib, pkgs, inputs, ... }: let
|
||||
lixCross = import inputs.nixpkgs-uconsole {
|
||||
localSystem = { system = "x86_64-linux"; };
|
||||
@@ -238,8 +239,8 @@
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
agenix.nixosModules.default
|
||||
agenix-rekey.nixosModules.default
|
||||
./hosts/uconsole-cm5/configuration.nix
|
||||
./hosts/uconsole-cm5/hardware-configuration.nix
|
||||
./hosts/uConsole/configuration.nix
|
||||
./hosts/uConsole/hardware-configuration.nix
|
||||
./modules/nixos/services/remote-builder.nix
|
||||
./modules/nixos/services/wireguard-client.nix
|
||||
./modules/nixos/services/clamav.nix
|
||||
@@ -269,9 +270,12 @@
|
||||
./modules/nixos/services/ollama_init_custom_models.nix
|
||||
./modules/nixos/services/open_code_server.nix
|
||||
./modules/nixos/services/clamav.nix
|
||||
./modules/nixos/services/wireguard-client.nix
|
||||
./modules/nixos/services/remote-builder.nix
|
||||
./modules/nixos/security/ai-worker-restricted.nix
|
||||
./users/gortium/gortium.nix
|
||||
./users/ai-worker/ai-worker.nix
|
||||
./users/builder.nix
|
||||
];
|
||||
};
|
||||
|
||||
@@ -284,6 +288,8 @@
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nix.package = lix.packages."aarch64-linux".default;
|
||||
}
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
agenix.nixosModules.default
|
||||
./hosts/cyt-pi/configuration.nix
|
||||
./hosts/cyt-pi/hardware-configuration.nix
|
||||
./modules/nixos/services/remote-builder.nix
|
||||
@@ -292,7 +298,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
||||
uConsole = nixpkgs-uconsole.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = {
|
||||
inherit self keys paths inputs;
|
||||
@@ -311,7 +317,7 @@
|
||||
devShells.${system}.default = devShell;
|
||||
|
||||
packages.${system} = {
|
||||
uconsole-cm5-image = (nixos-raspberrypi.lib.nixosSystem {
|
||||
uConsole-image = (nixos-raspberrypi.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = {
|
||||
inherit self keys inputs;
|
||||
|
||||
Reference in New Issue
Block a user