Merge branch 'uconsole-cm5-incremental' of ssh://code.lazyworkhorse.net:2222/gortium/infra into uconsole-cm5-incremental

These files were mixed into commit 16acc6a which was intended
to only fix SSH options for the uConsole configuration.

.gitmodules

@@ -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

assets/ollama/Dockerfile

@@ -1,106 +0,0 @@
-# ollama-gfx906/Dockerfile
-#
-# Custom ollama image with ROCm 6.1 + gfx906 (MI50) support.
-# The official ollama/rocm image ships ROCm 7.2 which dropped gfx906.
-# This uses v0.23.2's native CMake build system with AMDGPU_TARGETS including gfx906.
-#
-# Build: docker build -t ollama/ollama:rocm-gfx906 ai/ollama
-
-FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
-
-# Build dependencies (CMake, Ninja, Go)
-ARG CMAKEVERSION=3.31.2
-ARG NINJAVERSION=1.12.1
-ARG GOLANG_VERSION=1.22.0
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl git ccache build-essential pkg-config unzip \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install CMake from official binaries
-RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v${CMAKEVERSION}/cmake-${CMAKEVERSION}-linux-x86_64.tar.gz \
-    | tar xz -C /usr/local --strip-components 1
-
-# Install Ninja
-RUN curl -fsSL -o /tmp/ninja.zip \
-    https://github.com/ninja-build/ninja/releases/download/v${NINJAVERSION}/ninja-linux.zip \
-    && unzip /tmp/ninja.zip -d /usr/local/bin && rm /tmp/ninja.zip
-
-# Install Go
-RUN curl -fsSL https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \
-    | tar xz -C /usr/local
-ENV PATH=/usr/local/go/bin:$PATH
-
-ARG OLLAMA_VERSION=v0.23.2
-RUN git clone --depth 1 --branch ${OLLAMA_VERSION} https://github.com/ollama/ollama.git /build
-WORKDIR /build
-
-# ROCm paths
-ENV HIP_PATH=/opt/rocm
-ENV ROCM_PATH=/opt/rocm
-ENV CMAKE_GENERATOR=Ninja
-ENV LDFLAGS=-s
-
-# Step 1: Build CPU backends with GCC (no ROCm preset)
-# Pre-set CMAKE_HIP_COMPILER="" to prevent check_language(HIP) from
-# finding a HIP compiler (it searches /opt/rocm even without PATH).
-# Remove /opt/rocm from PATH to prevent find_program from finding hipcc.
-RUN mkdir -p build-cpu && \
-    PATH=/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    cmake -B build-cpu -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_HIP_COMPILER="" \
-      -DCMAKE_INSTALL_PREFIX=/build/dist && \
-    cmake --build build-cpu --target ggml-cpu -- -l $(nproc) && \
-    cmake --install build-cpu --component CPU --strip && \
-    echo "=== CPU install ===" && \
-    (find /build/dist/lib/ollama -type f -o -type l 2>&1 | head -20 || echo "empty")
-
-# Step 2: Build HIP backend with ROCm preset + gfx906 target only
-# The ROCm 6 preset enables HIP language detection (enable_language(HIP))
-# which ensures GPU kernels are properly compiled for gfx906.
-# OLLAMA_RUNNER_DIR=rocm from the preset, so HIP goes to lib/ollama/rocm/
-# Need CMAKE_PREFIX_PATH so find_package(hip) finds hip-config.cmake
-# at /opt/rocm/lib/cmake/hip/hip-config.cmake.
-RUN mkdir -p build-hip && \
-    cmake -B build-hip \
-      --preset 'ROCm 6' \
-      -DAMDGPU_TARGETS="gfx906:xnack-" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_PREFIX_PATH="/opt/rocm" && \
-    cmake --build build-hip --target ggml-hip -- -l $(nproc) && \
-    cmake --install build-hip --component HIP --strip && \
-    echo "=== HIP install ===" && \
-    find /build/dist/lib/ollama -type f -o -type l | head -20
-
-# Step 3: Build Go binary (GCC for CGo linking)
-ENV CGO_ENABLED=1
-RUN go build -trimpath -ldflags="-X=github.com/ollama/ollama/version.Version=${OLLAMA_VERSION}" -o /build/dist/ollama .
-
-# ---------- Runtime image ----------
-FROM ubuntu:24.04
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    ca-certificates curl libstdc++6 libgomp1 libvulkan1 libopenblas0 \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copy ROCm 6.1 runtime libraries
-# These are needed at runtime by ggml-hip via LD_LIBRARY_PATH
-COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
-COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
-
-# Copy ollama binary + all backends (CPU + HIP)
-# CPU install:  /build/dist/lib/ollama/libggml-*.so
-# HIP install:  /build/dist/lib/ollama/rocm/libggml-hip.so
-COPY --from=builder /build/dist/ollama /usr/bin/ollama
-COPY --from=builder /build/dist/lib/ollama/ /usr/lib/ollama/
-
-RUN ldconfig
-
-ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/lib/ollama/rocm:/usr/lib/ollama
-ENV HSA_OVERRIDE_GFX_VERSION=9.0.6
-ENV HCC_AMDGPU_TARGET=gfx906
-ENV HSA_ENABLE_SDMA=0
-
-EXPOSE 11434
-ENTRYPOINT ["/bin/ollama"]
-CMD ["serve"]

flake.lock

@@ -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": {

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,16 +41,12 @@
       pkgs = import nixpkgs {
         inherit system overlays;
         config.allowUnfree = true;
-        config.permittedInsecurePackages = [
+        config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
-          "openclaw-2026.3.12"
-        ];
       };
-
       devShell = import ./shells/nix_dev.nix {
         inherit pkgs system agenix;
       };
-    in
+    in {
-      {
       nixosConfigurations = {
         lazyworkhorse = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit system self keys paths inputs; };
@@ -48,9 +55,7 @@
               nixpkgs.overlays = overlays;
               nixpkgs.config.allowUnfree = true;
               nixpkgs.config.rocmSupport = true;
-                nixpkgs.config.permittedInsecurePackages = [
+              nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
-                  "openclaw-2026.3.12"
-                ];
               nix.package = lix.packages.${system}.default;
             }
             agenix.nixosModules.default
@@ -80,7 +85,115 @@
             ./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;
+
+      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;
+      };
     };
 }

hosts/lazyworkhorse/configuration.nix

@@ -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

hosts/uconsole-cm5/configuration.nix

@@ -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;
+  };
+
+
+}

hosts/uconsole-cm5/hardware-configuration.nix

@@ -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";
+}

modules/nixos/security/README-ai-worker.md

@@ -1,74 +1,64 @@
 # 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
 
-### 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
 - **Home directory**: `/home/ai-worker` (standard user home)
 - **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
 - **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
 
 Connect as:
@@ -80,42 +70,32 @@ The working directory will be `/home/ai-worker`. No infra repo access.
 
 ## Verification
 
+Check ai-worker permissions:
 ```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
 # Should show: ai-worker docker
 ```
 
 ## Troubleshooting
 
-If docker commands fail unexpectedly:
+If ai-worker cannot run docker commands:
-
 ```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:
-
 ```bash
 # Check SSH key is authorized
 cat /home/ai-worker/.ssh/authorized_keys

modules/nixos/security/ai-worker-restricted.nix

@@ -2,123 +2,16 @@
 
 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 {
     type = types.bool;
     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 {
-    # 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" ];
-
-    # 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 ];
   };
 }

modules/nixos/services/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./dotfiles.nix
+    ./systemd
+  ];
+}

modules/nixos/services/dotfiles.nix

@@ -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);
+    };
+  };
+}
+

secrets/home_wifi.age

@@ -0,0 +1,10 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
+YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
+V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
+Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
+aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
+cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
+TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
+KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
+-----END AGE ENCRYPTED FILE-----

secrets/secrets.nix

@@ -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;
 }

users/ai-worker.nix

@@ -4,8 +4,6 @@
     group = "ai-worker";
     home = "/home/ai-worker";
     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" ];
     shell = pkgs.bashInteractive;
     openssh.authorizedKeys.keys = [
@@ -16,14 +14,17 @@
   };
   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;
   
-  # Restricted sudo for ai-worker - security checks only (not for docker)
+  # Restricted sudo for ai-worker - security checks only
   security.sudo.extraRules = [
     {
       users = [ "ai-worker" ];
@@ -68,6 +69,15 @@
           command = "/run/current-system/sw/bin/sshd -T";
           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
         {
           command = "/run/current-system/sw/bin/ss -tlnp";

users/gortium/default.nix

@@ -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"];

users/gortium/home.nix

@@ -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;
+}