Compare commits
1 Commits
uconsole-c
...
feat/herme
| Author | SHA1 | Date | |
|---|---|---|---|
| 79210235fe |
88
flake.nix
88
flake.nix
@@ -12,23 +12,10 @@
|
|||||||
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;
|
||||||
# uConsole CM5 — pinned nixpkgs for kernel patch compatibility
|
|
||||||
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
|
|
||||||
nixos-uconsole = {
|
|
||||||
url = "github:nixos-uconsole/nixos-uconsole/v1.1.0";
|
|
||||||
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
|
outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
|
||||||
, 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;
|
||||||
@@ -93,78 +80,7 @@
|
|||||||
./hosts/cyt-pi/hardware-configuration.nix
|
./hosts/cyt-pi/hardware-configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# uConsole CM5 — cross-compilé (build sur x86_64, run sur ARM)
|
|
||||||
# Approche incrémentale pour fixer l'écran
|
|
||||||
# ============================================================
|
|
||||||
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
|
||||||
system = "aarch64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit self keys paths inputs;
|
|
||||||
nixos-raspberrypi = nixos-raspberrypi;
|
|
||||||
isCM4 = false;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
# Cross-compile : build sur x86_64, run sur aarch64
|
|
||||||
nixpkgs.buildPlatform = "x86_64-linux";
|
|
||||||
nixpkgs.hostPlatform = "aarch64-linux";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
boot.loader.raspberry-pi.bootloader = "kernel";
|
|
||||||
}
|
|
||||||
# nixos-raspberrypi — pkgs.rpi + overlays standardisés
|
|
||||||
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
|
||||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
|
||||||
nixos-raspberrypi.lib.inject-overlays
|
|
||||||
nixos-raspberrypi.lib.inject-overlays-global
|
|
||||||
# nixos-uconsole CM5 modules
|
|
||||||
nixos-uconsole.nixosModules.kernel
|
|
||||||
(nixos-uconsole.nixosModules.cm { lib = nixpkgs-uconsole.lib; isCM4 = false; })
|
|
||||||
nixos-uconsole.nixosModules.base
|
|
||||||
# Lix cross-compilé (lix.packages.aarch64-linux est natif → QEMU)
|
|
||||||
({ 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
|
|
||||||
agenix.nixosModules.default
|
|
||||||
# Notre config
|
|
||||||
./hosts/uconsole-cm5/configuration.nix
|
|
||||||
./hosts/uconsole-cm5/hardware-configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
devShells.${system}.default = devShell;
|
devShells.${system}.default = devShell;
|
||||||
packages.${system} = {
|
|
||||||
# Image SD flashable pour uConsole CM5 (SSH + WiFi + clés)
|
|
||||||
# Usage : dd if=result of=/dev/sda bs=4M status=progress conv=fsync
|
|
||||||
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.kernel
|
|
||||||
(nixos-uconsole.nixosModules.cm { lib = nixpkgs-uconsole.lib; isCM4 = false; })
|
|
||||||
nixos-uconsole.nixosModules.base
|
|
||||||
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" "ca-derivations" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
|
||||||
# Garbage collection
|
# Garbage collection
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
feat: add Hyperspace Pods NixOS module
|
|
||||||
|
|
||||||
Create modules/nixos/services/hyperspace.nix for the Hyperspace Pods
|
|
||||||
P2P AI cluster agent. Registered in flake.nix under lazyworkhorse.
|
|
||||||
|
|
||||||
- Fetches CLI binary v5.45.30 via fetchurl with SRI hash verification
|
|
||||||
- Systemd system service: auto profile, configurable api port 8080,
|
|
||||||
ai-worker user, GPU device access (kfd+dri), SupplementaryGroups
|
|
||||||
for video+render groups, service hardening
|
|
||||||
- Firewall: TCP 4001 libp2p, 30301 chain, 8080 API; UDP 4001 libp2p
|
|
||||||
- AMD MI50 ROCm via HSA_OVERRIDE_GFX_VERSION=9.0.6
|
|
||||||
- Adds video+render groups to ai-worker for persistent GPU access
|
|
||||||
@@ -1,134 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.hyperspace;
|
|
||||||
|
|
||||||
hyperspacePkg = pkgs.stdenv.mkDerivation {
|
|
||||||
name = "hyperspace-pods-${cfg.version}";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
url = "https://github.com/hyperspaceai/aios-cli/releases/download/v${cfg.version}/aios-cli-x86_64-unknown-linux-gnu.tar.gz";
|
|
||||||
hash = cfg.packageHash;
|
|
||||||
};
|
|
||||||
sourceRoot = ".";
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/libexec $out/bin
|
|
||||||
cp -r * $out/libexec/
|
|
||||||
chmod +x $out/libexec/aios-cli
|
|
||||||
ln -s $out/libexec/aios-cli $out/bin/hyperspace
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options.services.hyperspace = {
|
|
||||||
enable = lib.mkEnableOption "Hyperspace Pods P2P AI cluster agent";
|
|
||||||
|
|
||||||
version = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "5.45.30";
|
|
||||||
description = "Hyperspace CLI version to download.";
|
|
||||||
};
|
|
||||||
|
|
||||||
packageHash = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "sha256-f6fJ8t3exqtYwUD5j+WvD+Hm0oN/Eef0X+R9Rj23dE0=";
|
|
||||||
description = ''
|
|
||||||
SRI hash of the hyperspace release tarball (sha256-<base64>).
|
|
||||||
Must be updated when version changes. Generate with:
|
|
||||||
nix store prefetch-file --hash-algo sha256 \\
|
|
||||||
https://github.com/hyperspaceai/aios-cli/releases/download/v{version}/aios-cli-x86_64-unknown-linux-gnu.tar.gz
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
user = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "ai-worker";
|
|
||||||
description = "System user to run the Hyperspace agent.";
|
|
||||||
};
|
|
||||||
|
|
||||||
apiPort = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
default = 8080;
|
|
||||||
description = "OpenAI-compatible API port (configurable via --api-port).";
|
|
||||||
};
|
|
||||||
|
|
||||||
profile = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "auto";
|
|
||||||
description = ''
|
|
||||||
Agent profile. Options: auto (auto-detect hardware), full (all capabilities),
|
|
||||||
inference (GPU inference only), embedding (CPU embedding only),
|
|
||||||
relay (lightweight relay), storage (storage + memory).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
autoStart = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Start the agent automatically on boot.";
|
|
||||||
};
|
|
||||||
|
|
||||||
openFirewall = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Open P2P mesh (4001 TCP+UDP, 30301 TCP) and API port in the firewall.";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraArgs = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
default = [ ];
|
|
||||||
description = "Extra arguments to pass to 'hyperspace start'.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
systemd.services.hyperspace = {
|
|
||||||
description = "Hyperspace Pods P2P AI Cluster Agent";
|
|
||||||
after = [ "network.target" "network-online.target" ];
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
wantedBy = lib.mkIf cfg.autoStart [ "multi-user.target" ];
|
|
||||||
|
|
||||||
path = with pkgs; [ bash coreutils ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
User = cfg.user;
|
|
||||||
Group = cfg.user;
|
|
||||||
WorkingDirectory = "${hyperspacePkg}/libexec";
|
|
||||||
ExecStart = "${hyperspacePkg}/bin/hyperspace start --profile ${cfg.profile} --api-port ${toString cfg.apiPort} ${lib.escapeShellArgs cfg.extraArgs}";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = 5;
|
|
||||||
|
|
||||||
# AMD MI50 (ROCm) device access
|
|
||||||
DeviceAllow = [ "/dev/kfd rw" "/dev/dri rw" ];
|
|
||||||
|
|
||||||
# Supplementary groups for GPU/accelerator access
|
|
||||||
SupplementaryGroups = [ "video" "render" ];
|
|
||||||
|
|
||||||
# Hardening
|
|
||||||
NoNewPrivileges = true;
|
|
||||||
ProtectHome = "tmpfs";
|
|
||||||
ProtectSystem = "strict";
|
|
||||||
PrivateTmp = true;
|
|
||||||
PrivateDevices = false; # Needs /dev/kfd and /dev/dri
|
|
||||||
};
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
HSA_OVERRIDE_GFX_VERSION = "9.0.6";
|
|
||||||
HOME = "/home/${cfg.user}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Firewall ports for P2P mesh (libp2p 4001, chain 30301) and API
|
|
||||||
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 4001 30301 cfg.apiPort ];
|
|
||||||
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 4001 ];
|
|
||||||
|
|
||||||
# Add GPU/accelerator groups to the service user (persistent beyond service restarts)
|
|
||||||
users.users = lib.mkIf (cfg.user == "ai-worker") {
|
|
||||||
ai-worker = {
|
|
||||||
extraGroups = [ "video" "render" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ROCm override for AMD MI50 (gfx906) compatibility
|
|
||||||
environment.variables.HSA_OVERRIDE_GFX_VERSION = "9.0.6";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{ 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;
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
{ 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,10 +0,0 @@
|
|||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
|
|
||||||
YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
|
|
||||||
V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
|
|
||||||
Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
|
|
||||||
aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
|
|
||||||
cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
|
|
||||||
TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
|
|
||||||
KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
@@ -11,5 +11,4 @@ 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;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user