merge: accept remote flake.nix

flake.nix

@@ -8,247 +8,46 @@
       inputs.darwin.follows = "";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    agenix-rekey = {
-      url = "github:oddlama/agenix-rekey";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     lix = {
       url = "git+https://git.lix.systems/lix-project/lix?ref=main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixos-uconsole = {
-      url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
+      url = "github:nixos-uconsole/nixos-uconsole";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
     };
     nixos-raspberrypi = {
-      url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
+      url = "github:nvmd/nixos-raspberrypi/v1.20260517.0";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-    self.submodules = true;
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
+    self.submodules = true;
   };
 
-  outputs = { self, nixpkgs, agenix, agenix-rekey, lix
+  outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, home-manager, ... }@inputs:
-            , nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
-            , home-manager
-            , ... }@inputs:
     let
       system = "x86_64-linux";
       keys = import ./lib/keys.nix;
-      paths = {
+      paths = import ./lib/paths.nix;
-        flake = "/home/gortium/infra";
+      overlays = [
-        identities = [
+        agenix.overlays.default
-          "/home/gortium/.ssh/gortium_ssh_key"
+        (import ./overlays/reticulum.nix) ];
-          "/etc/ssh/ssh_host_ed25519_key"
-          "/root/.age/bootstrap.key" ];
-      };
-      overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
       pkgs = import nixpkgs {
         inherit system overlays;
         config.allowUnfree = true;
-        config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
+        config.permittedInsecurePackages = [
+          "openclaw-2026.3.12"
+        ];
       };
+
       devShell = import ./shells/nix_dev.nix {
         inherit pkgs system agenix;
       };
-
+    in
-
-       ##############################################################################
-      # CROSS-COMPILE WORKAROUNDS — packages that fail aarch64 cross-compile
-      #
-      # These packages need NATIVE COMPILATION on the uConsole itself (aarch64).
-      # They cannot cross-compile from x86_64 for various reasons listed below.
-      # We work around them in the overlay until we set up distributed builds
-      # with the uConsole as a native aarch64 builder.
-      #
-      # ==== Cross-compile failures ====
-      #
-      # libcamera / libcamera-rpi / libpisp:
-      #   meta.platforms excludes aarch64. pipewire hard-depends on them in nixos-25.11.
-      #   Fix: empty meta.platforms + strip from pipewire buildInputs.
-      #
-      # gjs:
-      #   Need native display (GTK3/4 tests) for cross-compile configure.
-      #   Fix: meson -Dskip_gtk_tests=true.
-      #
-      # hyprland:
-      #   Qt6Quick missing from aarch64 qtdeclarative, breaks hyprland-qt-support.
-      #   Fix: wrapRuntimeDeps=false (Qt UI components disabled, WM still works).
-      #
-      # boost.mpi:
-      #   Boost.Build has no b2 architecture alternatives for ARM.
-      #   Fix: useMpi=false.
-      #
-      # perl-ldap (perlPackages.perlldap):
-      #   Module::Install requires Perl dynamic loading (Fcntl) which is
-      #   unavailable in cross-compiled Perl.
-      #   Fix: stripped from john.s propagatedBuildInputs.
-      #
-      # john (John the Ripper):
-      #   Indirectly affected — depends on perl-ldap for perl utility scripts.
-      #   Fix: perl-ldap stripped from propagatedBuildInputs (john still works,
-      #   just loses sha-dump.pl etc. LDAP support).
-      #
-      # gss (GNU Generic Security Service):
-      #   autogen.sh fails cross-compile. Pulled by mailutils → emacs-pgtk.
-      #   Fix: emacs withMailutils=false.
-      #
-      # emacs-pgtk:
-      #   Indirectly affected — depends on mailutils which depends on gss.
-      #   Fix: withMailutils=false (no mail/IMAP within emacs).
-      #
-      # qtquick3d (Qt6):
-      #   Qt::Quick not available in aarch64 cross-compile qtdeclarative.
-      #   cmake skips build, ninja has no install target.
-      #   Fix: removed js8call, switched wireshark → wireshark-cli.
-      #
-      # js8call:
-      #   REMOVED from system packages. Depends on Qt6 multimedia → qtquick3d.
-      #
-      # wireshark-qt:
-      #   SWITCHED to wireshark-cli. Same Qt6 multimedia → qtquick3d chain.
-      #
-# neovim:
-#   `libnlua0.so` built for aarch64, luajit (x86_64) tries to load it
-#   during codegen (preload_nlua.lua). No clean override option.
-#   Fix: remove from system packages + install via native build
-#   once uConsole is set up as remote builder.
-#
-# clamav:
-#   cmake try_run() + Rust proc-macro can't find native linker in
-#   cross-compile (cc crate uses cross CC, no cc in PATH for build
-#   scripts). Chain: clamav → system-path → etc → dbus → polkit.
-#   Fix: remove from system packages; clamscan available from server.
-
-#
-# ==== Remote builder setup (bidirectional) — TODO ====
-# To eliminate cross-compile exceptions, set up distributed builds:
-# 1. Create a dedicated `builder` user on both hosts (no shell, home=/var/empty)
-# 2. Add the same SSH key to both hosts (symmetric)
-# 3. On lazyworkhorse — `nix.buildMachines` pointing to uConsole for aarch64-linux
-# 4. On uConsole — `nix.buildMachines` pointing to lazyworkhorse for x86_64-linux
-# 5. Remove the uconsoleCrossOverlay workarounds above
-# 6. Nix auto-dispatches derivations by `system` — no per-package exceptions needed
-# Example buildMachines config:
-# Server dispatches aarch64 builds to uConsole (4 cores, less power):
-#   nix.buildMachines = [{
-#     hostName = "uConsole.local";
-#     systems = ["aarch64-linux"];
-#     maxJobs = 4;
-#     sshUser = "builder";
-#     sshKey = "/etc/ssh/builder_key";
-#   }];
-# uConsole dispatches x86_64 builds to server (36 cores, 256GB RAM):
-#   nix.buildMachines = [{
-#     hostName = "lazyworkhorse.net";
-#     port = 2424;
-#     systems = ["x86_64-linux"];
-#     maxJobs = 36;
-#     sshUser = "builder";
-#     sshKey = "/etc/ssh/builder_key";
-#   }];
-
-      # ==== How to build natively on uConsole ====
-      # To native-compile these on the uConsole:
-      # 1. Add uConsole as a remote builder (nix.buildMachines)
-      # 2. Set nix.extra-platforms = [ "aarch64-linux" ] on server
-      # 3. Remove the overlay workarounds below
-      # 4. Packages will auto-dispatch to uConsole for native builds
-      ##############################################################################
-      uconsoleCrossOverlay = final: prev: {
-        libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
-        libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
-        libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
-        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 = prev.gjs.overrideAttrs (old: {
-          mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
-        });
-        hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
-        boost = prev.boost.override { useMpi = false; };
-        # perl-ldap cannot cross-compile (Module::Install needs dynamic loading)
-        xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
-          preConfigure = (old.preConfigure or "") + ''
-            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"
-          '';
-        });
-        emacs-pgtk = prev.emacs-pgtk.override { withMailutils = false; };
-        # perl-ldap fails cross-compile (Module::Install needs dynamic loading)
-        # Strip it from john deps -- the perl scripts that need it are not critical
-        john = prev.john.overrideAttrs (old: {
-          nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
-            prev.buildPackages.python3  # python3 for opencl_generate_dynamic_loader.py
-          ];
-          configureFlags = (old.configureFlags or []) ++ [
-            "ac_cv_prog_PYTHON=${prev.buildPackages.python3}/bin/python3"
-          ];
-          propagatedBuildInputs = builtins.filter
-            (x: x?pname && x.pname != "perl-ldap")
-            (old.propagatedBuildInputs or []);
-        });
-        # clamav: removed from system packages (see note above).
-      };
-
-      uconsoleRpiPipewireOverlay = 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" ];
-        });
-      };
-
-      uconsoleBaseModules = [
       {
-          nixpkgs.buildPlatform = "x86_64-linux";
-          nixpkgs.hostPlatform = "aarch64-linux";
-          nixpkgs.config.allowUnfree = true;
-          boot.loader.raspberry-pi.bootloader = "kernel";
-          nixpkgs.overlays = [ uconsoleCrossOverlay (import ./overlays/reticulum.nix) ];
-        }
-        nixos-raspberrypi.nixosModules.nixpkgs-rpi
-        ({ config, lib, pkgs, ... }: {
-          nixpkgs.overlays = [ uconsoleRpiPipewireOverlay ];
-        })
-        nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-        nixos-raspberrypi.lib.inject-overlays
-        nixos-raspberrypi.lib.inject-overlays-global
-        nixos-uconsole.nixosModules.uconsole-cm5
-        ./modules/nixos/hardware/uConsole-aio-v2.nix
-        ({ config, lib, pkgs, inputs, ... }: let
-          lixCross = import inputs.nixpkgs-uconsole {
-            localSystem = { system = "x86_64-linux"; };
-            crossSystem = { system = "aarch64-linux"; };
-            overlays = [ inputs.lix.overlays.default ];
-          };
-        in { nix.package = lixCross.lix; })
-        inputs.home-manager.nixosModules.home-manager
-        agenix.nixosModules.default
-        agenix-rekey.nixosModules.default
-        ./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
-        ./modules/nixos/security/ai-worker-restricted.nix
-        ./users/gortium/gortium.nix
-        ./users/ai-worker/ai-worker.nix
-      ];
-    in {
         nixosConfigurations = {
           lazyworkhorse = nixpkgs.lib.nixosSystem {
             specialArgs = { inherit system self keys paths inputs; };
@@ -257,26 +56,23 @@
                 nixpkgs.overlays = overlays;
                 nixpkgs.config.allowUnfree = true;
                 nixpkgs.config.rocmSupport = true;
-              nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
+                nixpkgs.config.permittedInsecurePackages = [
+                  "openclaw-2026.3.12"
+                ];
                 nix.package = lix.packages.${system}.default;
               }
-            inputs.home-manager.nixosModules.home-manager
               agenix.nixosModules.default
-            agenix-rekey.nixosModules.default
               ./hosts/lazyworkhorse/configuration.nix
               ./hosts/lazyworkhorse/hardware-configuration.nix
               ./modules/nixos/filesystem/hoardingcow-mount.nix
               ./modules/nixos/services/docker_manager.nix
-            ./modules/nixos/filesystem/poup-16t-disk.nix
-            ./modules/nixos/services/ollama_init_custom_models.nix
               ./modules/nixos/services/open_code_server.nix
-            ./modules/nixos/services/clamav.nix
+              ./modules/nixos/services/ollama_init_custom_models.nix
-            ./modules/nixos/services/wireguard-client.nix
+              ./modules/nixos/services/openclaw_node.nix
-            ./modules/nixos/services/remote-builder.nix
+              ./modules/nixos/filesystem/poup-16t-disk.nix
               ./modules/nixos/security/ai-worker-restricted.nix
-            ./users/gortium/gortium.nix
+              ./users/gortium.nix
-            ./users/ai-worker/ai-worker.nix
+              ./users/ai-worker.nix
-            ./users/builder.nix
             ];
           };
 
@@ -289,46 +85,29 @@
                 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
-        ./modules/nixos/services/wireguard-client.nix
-            ./users/gortium/gortium.nix
             ];
           };
 
-        uConsole = nixpkgs-uconsole.lib.nixosSystem {
+          uConsole = nixos-raspberrypi.lib.nixosSystem {
-          system = "aarch64-linux";
+            specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
-          specialArgs = {
+            modules = [
-            inherit self keys paths inputs;
+              {
-            nixos-raspberrypi = nixos-raspberrypi;
+                nixpkgs.overlays = overlays;
-            isCM4 = false;
+                nixpkgs.config.allowUnfree = true;
-          };
+                nixpkgs.hostPlatform = "aarch64-linux";
-          modules = uconsoleBaseModules;
+                nix.package = lix.packages."aarch64-linux".default;
+              }
+              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
+              nixos-uconsole.nixosModules.uconsole-cm5
+              agenix.nixosModules.default
+              ./modules/nixos/hardware/uconsole-cm5-aio-v2.nix
+              ./hosts/uConsole/configuration.nix
+              ./hosts/uConsole/hardware-configuration.nix
+            ];
           };
         };
-
-      agenix-rekey = agenix-rekey.configure {
-        userFlake = self;
-        nixosConfigurations = self.nixosConfigurations;
-      };
-
         devShells.${system}.default = devShell;
-
-      packages.${system} = {
-        uConsole-image = (nixos-raspberrypi.lib.nixosSystem {
-          system = "aarch64-linux";
-          specialArgs = {
-            inherit self keys inputs;
-            nixos-raspberrypi = nixos-raspberrypi;
-            isCM4 = false;
-          };
-          modules = uconsoleBaseModules ++ [
-            nixos-raspberrypi.nixosModules.sd-image
-          ];
-        }).config.system.build.sdImage;
-      };
       };
 }

hosts/cyt-pi/configuration.nix

@@ -21,7 +21,14 @@
     settings.PermitRootLogin = "prohibit-password";
   };
 
-  # User (defined in users/gortium/gortium.nix)
+  # User
+  users.users.gortium = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "networkmanager" "kismet" ];
+    openssh.authorizedKeys.keys = [
+      # Populate with your public key
+    ];
+  };
 
   # CYT Project Dependencies (Headless)
   environment.systemPackages = with pkgs; [
@@ -70,12 +77,6 @@
     };
   };
 
-
-  # Age secrets
-  age.secrets.gortium_password = {
-    file = ../../secrets/gortium_password.age;
-  };
-
   # CYT Application Service
   systemd.services.cyt-app = {
     description = "Chasing Your Tail - Target Detector";

hosts/lazyworkhorse/configuration.nix

@@ -9,12 +9,8 @@
   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" ];
-  nix.settings.extra-platforms = [ "aarch64-linux" ];
-
-  # QEMU binfmt for cross-building aarch64 NixOS targets
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
   # Garbage collection
   nix.gc = {
@@ -170,8 +166,9 @@
     settings = {
       PasswordAuthentication = false;
       KbdInteractiveAuthentication = false;
-    };
+  # ============================================================
-    hostKeys = [
+  # ClamAV antivirus — daemon, hourly updates, daily scan, on-access
+  # ============================================================
       {
         path = "/etc/ssh/ssh_host_ed25519_key";
         type = "ed25519";
@@ -251,9 +248,7 @@
   
   # Private host ssh key managed by agenix
   age = {
-    identityPaths = paths.identities ++ [
+    identityPaths = paths.identities;
-      "/etc/ssh/ssh_host_ed25519_key"
-    ];
     secrets = {
       containers_env = {
         file = ../../secrets/containers.env.age;
@@ -276,6 +271,13 @@
         mode = "0600";
         path = "/home/ai-worker/.ssh/ai_ssh_key";
       };
+      openclaw_gateway_token = {
+        file = ../../secrets/openclaw_gateway_token.age;
+        owner = "root";
+        group = "ai-worker";
+        mode = "0440";
+        path = "/run/secrets/openclaw_gateway_token";
+      };
       wireguard_private_key = {
         file = ../../secrets/wireguard_private_key.age;
         owner = "root";
@@ -290,21 +292,17 @@
         mode = "0400";
         path = "/run/secrets/wireguard_preshared_key";
       };
-            builder_key = {
-        file = ../../secrets/builder_key.age;
-        owner = "root";
-        group = "root";
-        mode = "0600";
-        path = "/etc/ssh/builder_key";
-      };
-      gortium_password = {
-        file = ../../secrets/gortium_password.age;
-        owner = "gortium";
-        group = "gortium";
-        mode = "0400";
-        path = "/run/secrets/gortium_password";
     };
   };
+
+  # OpenClaw Node service (host-side execution for Docker gateway)
+  services.openclaw-node = {
+    enable = true;
+    user = "ai-worker";
+    gatewayHost = "127.0.0.1";
+    gatewayPort = 18789;
+    gatewayTokenFile = "/run/secrets/openclaw_gateway_token";
+    displayName = "lazyworkhorse-host";
   };
 
   # Public host ssh key (kept in sync with the private one)
@@ -569,29 +567,21 @@
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "25.05"; # Did you read the comment?
 
-
-  # ============================================================
-  # Remote builder — dispatches aarch64-linux builds to uConsole
-  # ============================================================
-  services.remoteBuilder = {
-    enable = true;
-    machines = [
-      {
-        hostName = "192.168.1.120";
-        port = 22;
-        sshUser = "builder";
-        sshKey = config.age.secrets.builder_key.path;
-        systems = [ "aarch64-linux" ];
-        maxJobs = 4;
-      }
-    ];
-  };
-
-
-  # agenix-rekey — automatic re-encryption for each target host
-  age.rekey = {
-    masterIdentities = [
-      "/home/gortium/.ssh/gortium_ssh_key"
-    ];
-  };
 }
+
+  # Remote builder — uConsole for aarch64-linux native builds
+  nix.distributedBuilds = true;
+  nix.buildMachines = [{
+    hostName = "192.168.1.120";
+    systems = ["aarch64-linux"];
+    maxJobs = 4;
+    supportedFeatures = ["big-parallel" "nixos-test" "benchmark" "gccarch-armv8-a"];
+    sshUser = "builder";
+    sshKey = "/home/ai-worker/id_deploy";
+  }];
+  nix.extraOptions = '
+    builders-use-substitutes = true
+    fallback = true
+  ';
+
+

hosts/uconsole-cm5/configuration.nix

@@ -106,18 +106,18 @@
     htop
     tmux
     # ===== HAM Radio =====
-    # wsjtx # removed for bootstrap - now native (native-only, needs remote build)
+    wsjtx # removed for bootstrap - now native
-    # fldigi # removed for bootstrap - now native (native-only, needs remote build)
+    fldigi # removed for bootstrap - now native
     pat                        # Winlink client
     direwolf                   # AX.25 packet modem
-    # chirp # Radio programming tool - now native (native-only, needs remote build)
+    chirp # Radio programming tool - now native
     hamlib                     # Ham radio control libraries
-    # trustedqsl # Logbook of the World (LoTW) - now native (native-only, needs remote build)
+    trustedqsl # Logbook of the World (LoTW) - now native
     # ===== SDR / RF =====
-    # sdrpp # removed for bootstrap - now native (native-only, needs remote build)
+    sdrpp # removed for bootstrap - now native
-    # gqrx # removed for bootstrap - now native (native-only, needs remote build)
+    gqrx # removed for bootstrap - now native
     rtl-sdr                    # RTL-SDR drivers & utilities
-    # inspectrum # removed for bootstrap - now native (native-only, needs remote build)
+    inspectrum # removed for bootstrap - now native
     soapysdr-with-plugins      # SoapySDR + hardware support plugins
     # ===== Mesh / LoRa =====
     reticulumStack             # Reticulum Network Stack
@@ -132,9 +132,9 @@
     john # John the Ripper - now native
     sqlmap                     # SQL injection tool
     # ===== GPS / Maps =====
-    #foxtrotgps # removed for bootstrap - now native (native-only, needs remote build)
+    foxtrotgps # removed for bootstrap - now native
-    #viking # removed for bootstrap - now native (native-only, needs remote build)
+    viking # removed for bootstrap - now native
-    #gpsbabel # GPS data conversion - now native (native-only, needs remote build)
+    gpsbabel # GPS data conversion - now native
   ];
   # ============================================================
   # Reticulum Service (rnsd)
@@ -192,32 +192,6 @@
   networking.firewall.allowedTCPPorts = [ 22 ];
   networking.firewall.allowedUDPPorts = [ ];
   # ============================================================
-  # Remote builder — dispatches x86_64-linux builds to lazyworkhorse
-  # ============================================================
-  services.remoteBuilder = {
-    enable = true;
-    machines = [
-      {
-        hostName = "lazyworkhorse.net";
-        port = 2424;
-        sshUser = "builder";
-        sshKey = config.age.secrets.builder_key.path;
-        systems = [ "x86_64-linux" ];
-        maxJobs = 36;
-        supportedFeatures = [ "benchmark" "big-parallel" "nixos-test" ];
-      }
-    ];
-  };
-  # Age secret for builder SSH key (remote building)
-  age.secrets.builder_key = {
-    file = ../../secrets/builder_key.age;
-  };
-
-  # ============================================================
-  age.identityPaths = [
-    "/etc/ssh/ssh_host_ed25519_key"
-  ];
-
   # agenix-rekey — automatic secret re-encryption at deploy time
   # ============================================================
   age.rekey = {
@@ -228,7 +202,7 @@
     # uConsole SSH host pubkey — for automatic rekey at build time
     # Once uConsole is deployed, replace with actual pubkey from:
     #   ssh-keyscan uConsole.local | ssh-to-age
-    hostPubkey = "age1un8td4jzkhg5fm4jja7z3aznskc8hlcm8ky0j2f70tv74rulwgaqtpemn2"; # uConsole CM5 SSH host key
+    hostPubkey = "age1qyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqs3290gq"; # dummy — replace after bootstrap
   };
 
   # Pipewire overlay: drop libcamera (fixes aarch64 cross-compile — rpi-pisp blocks)

lib/keys.nix

@@ -9,13 +9,6 @@
     ai-worker = {
       main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf";
     };
-
-    builder = {
-      # Same key on both hosts for bidirectional remote building.
-      # Generate with: ssh-keygen -t ed25519 -f /etc/ssh/builder_key -N ""
-      # Replace the placeholder below with the public key (builder_key.pub).
-      main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByG79NM/rk13q3MTow9Ezb8pe3RWoQ76Mv8atASp3Ri";
-    };
   };
 
   hosts = {
@@ -25,9 +18,5 @@
       gitea = "";
       bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste";
     };
-    uConsole = {
-      main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICasvsmaHuNVaWnjwuBfoMXyY/6PIqGL8yxstPBb46u4";
-      bootstrap = "age1un8td4jzkhg5fm4jja7z3aznskc8hlcm8ky0j2f70tv74rulwgaqtpemn2";
-    };
   };
 }

modules/nixos/services/openclaw_node.nix

@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.openclaw-node;
+  openclawPkg = pkgs.openclaw;
+in {
+  options.services.openclaw-node = {
+    enable = lib.mkEnableOption "OpenClaw Node service";
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "ai-worker";
+      description = "User to run the OpenClaw headless node as.";
+    };
+
+    gatewayHost = lib.mkOption {
+      type = lib.types.str;
+      default = "127.0.0.1";
+      description = "Gateway host (IP or hostname).";
+    };
+
+    gatewayPort = lib.mkOption {
+      type = lib.types.int;
+      default = 18789;
+      description = "Gateway WebSocket port.";
+    };
+
+    gatewayTokenFile = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "Path to file containing the gateway auth token.";
+    };
+
+    displayName = lib.mkOption {
+      type = lib.types.str;
+      default = "lazyworkhorse-host";
+      description = "Display name for this node (shown in pairing).";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.openclaw-node = {
+      description = "OpenClaw Headless Node Service";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Type = "exec";
+        User = cfg.user;
+        Group = cfg.user;
+        WorkingDirectory = "/home/${cfg.user}";
+        ExecStart = ''
+          ${pkgs.bash}/bin/bash -c 'export OPENCLAW_GATEWAY_TOKEN=$(cat ${cfg.gatewayTokenFile}) && exec ${openclawPkg}/bin/openclaw node run --host ${cfg.gatewayHost} --port ${toString cfg.gatewayPort} --display-name "${cfg.displayName}"'
+        '';
+        Restart = "always";
+        RestartSec = 5;
+      };
+
+      environment = {
+        NODE_ENV = "production";
+      };
+    };
+  };
+}

modules/nixos/services/remote-builder.nix

@@ -3,71 +3,69 @@ let
   cfg = config.services.remoteBuilder;
 in {
   options.services.remoteBuilder = {
-    enable = lib.mkEnableOption "remote Nix build machine";
+    enable = lib.mkEnableOption "remote Nix build machine (lazyworkhorse server)";
 
-    machines = lib.mkOption {
+    buildMachine = {
-      type = lib.types.listOf (lib.types.submodule {
+      host = lib.mkOption {
-        options = {
-          hostName = lib.mkOption {
         type = lib.types.str;
+        default = "lazyworkhorse.net";
         description = "Hostname or IP of the remote build machine.";
       };
-          port = lib.mkOption {
-            type = lib.types.port;
-            default = 22;
-            description = "SSH port.";
-          };
       sshUser = lib.mkOption {
         type = lib.types.str;
-            default = "builder";
+        default = "ai-worker";
         description = "SSH user on the remote build machine.";
       };
-          sshKey = lib.mkOption {
+      port = lib.mkOption {
-            type = lib.types.str;
+        type = lib.types.port;
-            description = "Path to SSH private key for the builder.";
+        default = 2424;
+        description = "SSH port — added via ~root/.ssh/config since nix.buildMachines has no sshPort option.";
       };
       systems = lib.mkOption {
         type = lib.types.listOf lib.types.str;
-            default = [ "aarch64-linux" ];
+        default = [ "aarch64-linux" "x86_64-linux" ];
         description = "System types the remote builder can build for.";
       };
       maxJobs = lib.mkOption {
         type = lib.types.int;
-            default = 4;
+        default = 16;
         description = "Max parallel jobs on the remote builder.";
       };
       supportedFeatures = lib.mkOption {
         type = lib.types.listOf lib.types.str;
-            default = [ "benchmark" "big-parallel" "nixos-test" ];
+        default = [ "big-parallel" "nixos-test" "benchmark" ];
         description = "Features the remote builder supports.";
       };
     };
-      });
+
-      default = [];
+    fallbackLocal = lib.mkOption {
-      description = "List of remote Nix build machines.";
+      type = lib.types.bool;
+      default = true;
+      description = "Fall back to local build when remote builder is unreachable.";
     };
   };
 
   config = lib.mkIf cfg.enable {
     nix.distributedBuilds = true;
-    nix.buildMachines = map (m: {
+    nix.buildMachines = [{
-      hostName = m.hostName;
+      hostName = cfg.buildMachine.host;
-      sshUser = m.sshUser;
+      sshUser = cfg.buildMachine.sshUser;
-      sshKey = m.sshKey;
+      systems = cfg.buildMachine.systems;
-      systems = m.systems;
+      maxJobs = cfg.buildMachine.maxJobs;
-      maxJobs = m.maxJobs;
+      supportedFeatures = cfg.buildMachine.supportedFeatures;
-      supportedFeatures = m.supportedFeatures;
+    }];
-    }) cfg.machines;
 
-    # SSH config for port + key (nix.buildMachines has no port option)
+    nix.extraOptions = lib.optionalString cfg.fallbackLocal ''
-    programs.ssh.extraConfig = lib.concatStringsSep "\n" (map (m: ''
+      builders-use-substitutes = true
-      Host ${m.hostName}
+      fallback = true
-        HostName ${m.hostName}
+    '';
-        Port ${toString m.port}
+
-        User ${m.sshUser}
+    # SSH config for the remote builder (since nix.buildMachines has no port option)
-        IdentityFile ${m.sshKey}
+    programs.ssh.extraConfig = ''
-        StrictHostKeyChecking no
+      Host ${cfg.buildMachine.host}
-        UserKnownHostsFile /dev/null
+        HostName ${cfg.buildMachine.host}
-    '') cfg.machines);
+        Port ${toString cfg.buildMachine.port}
+        User ${cfg.buildMachine.sshUser}
+    '';
   };
 }

secrets/openclaw_gateway_token.age

@@ -0,0 +1,11 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBCWEpO
+cG9yNnFpcHFqTkNzTngxU1MxN0NYK0hrZFhUTjVORWFrK3JNd2tZCmtMTGpwQk1E
+WlUwL3N6SGRWblpnNEkrWkkyU2hQMkRIK0M3R0pOVEREV3MKLT4gY2osLWdyZWFz
+ZSBacSozVVQgUCAxRS1OQSAuKXxDPCoKbStWNW1BZjBZQzNDaTlDbU5EZkxsRWxM
+cXJ3dDU1RDNpOXRlV0tzdEp2NUo3S1lhRG5Md0RHTGlJdkFSYmt5YQo4R1hiQWRG
+V2VxekJKZwotLS0geG1XSi9VbkhXZHQzcEFVS3hKNzVueXFLa2xnZTc3Q2tJTVZ5
+eXJabWk5Ywp6bJCP3s0xxzjE+eTR+cv7ZUnkoliT/n7uIprq1BTn/LIRLkUTUqs3
+NiDwrXcoq4/QKd0Dt+8ap3vFAuusjGxRlnYMaRrZie2AGtTV8U7Q7durm9o2K+/4
+QzRQ/MtumIQm
+-----END AGE ENCRYPTED FILE-----

secrets/secrets.nix

@@ -12,7 +12,5 @@ in
   "home_wifi.age".publicKeys = authorizedKeys;
   "lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
   "n8n_ssh_key.age".publicKeys = authorizedKeys;
-"builder_key.age".publicKeys = authorizedKeys ++ [
+  "openclaw_gateway_token.age".publicKeys = authorizedKeys;
-    keys.hosts.uConsole.bootstrap
-  ];
 }

users/builder.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, keys, ... }: {
-  users.users.builder = {
-    isSystemUser = true;
-    group = "builder";
-    home = "/var/empty";
-    createHome = false;
-    shell = "${pkgs.shadow}/bin/nologin";
-    openssh.authorizedKeys.keys = with keys; [
-      users.builder.main
-    ];
-  };
-  users.groups.builder = {};
-}