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

Remove stale files..
remove hyperspace files accidentally committed from feat/hyperspace-pods-module
2026-06-14 19:00:37 -04:00 · 2026-06-14 19:00:26 -04:00 · 2026-06-14 18:58:35 -04:00 · 2026-06-14 18:53:53 -04:00 · 2026-06-14 18:43:04 -04:00 · 2026-06-14 10:11:44 -04:00
16 changed files with 436 additions and 431 deletions
--- a/.gitmodules
+++ b/.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
--- a/assets/compose
+++ b/assets/compose
--- a/assets/ollama/Dockerfile
+++ b/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"]
--- a/flake.lock
+++ b/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": {
--- a/flake.nix
+++ b/flake.nix
@@ -12,18 +12,21 @@
      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:nixos-uconsole/nixos-uconsole";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
+      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+      inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
    };
    nixos-raspberrypi = {
-      url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
+      inputs.nixpkgs.follows = "nixpkgs-uconsole";
    };
-    self.submodules = true;
  };

-  outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
+  outputs = { self, nixpkgs, agenix, lix
+            , nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
+            , ... }@inputs:
    let
      system = "x86_64-linux";
      keys = import ./lib/keys.nix;
@@ -34,77 +37,163 @@
          "/etc/ssh/ssh_host_ed25519_key"
          "/root/.age/bootstrap.key" ];
      };
-      overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
+      overlays = [ agenix.overlays.default ];
      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
-      {
-        nixosConfigurations = {
-          lazyworkhorse = nixpkgs.lib.nixosSystem {
-            specialArgs = { inherit system self keys paths inputs; };
-            modules = [
-              {
-                nixpkgs.overlays = overlays;
-                nixpkgs.config.allowUnfree = true;
-                nixpkgs.config.rocmSupport = true;
-                nixpkgs.config.permittedInsecurePackages = [
-                  "openclaw-2026.3.12"
-                ];
-                nix.package = lix.packages.${system}.default;
-              }
-              agenix.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/services/open_code_server.nix
-              ./modules/nixos/services/ollama_init_custom_models.nix
-              ./modules/nixos/services/openclaw_node.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 = [
-              {
-                nixpkgs.overlays = overlays;
-                nixpkgs.config.allowUnfree = true;
-                nixpkgs.hostPlatform = "aarch64-linux";
-                nix.package = lix.packages."aarch64-linux".default;
-              }
-              ./hosts/cyt-pi/configuration.nix
-              ./hosts/cyt-pi/hardware-configuration.nix
-            ];
-          };
-
-          uConsole = nixos-raspberrypi.lib.nixosSystem {
-            specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
-            modules = [
-              {
-                nixpkgs.overlays = overlays;
-                nixpkgs.config.allowUnfree = true;
-                nixpkgs.hostPlatform = "aarch64-linux";
-                nix.package = lix.packages."aarch64-linux".default;
-              }
-              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
-              nixos-uconsole.nixosModules.uconsole-cm5
-              ./hosts/uConsole/configuration.nix
-              ./hosts/uConsole/hardware-configuration.nix
-            ];
-          };
+    in {
+      nixosConfigurations = {
+        lazyworkhorse = nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit system self keys paths inputs; };
+          modules = [
+            {
+              nixpkgs.overlays = overlays;
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.config.rocmSupport = true;
+              nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
+              nix.package = lix.packages.${system}.default;
+            }
+            agenix.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/services/open_code_server.nix
+            ./modules/nixos/services/ollama_init_custom_models.nix
+            ./modules/nixos/services/openclaw_node.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 = [
+            {
+              nixpkgs.overlays = overlays;
+              nixpkgs.config.allowUnfree = true;
+              nixpkgs.hostPlatform = "aarch64-linux";
+              nix.package = lix.packages."aarch64-linux".default;
+            }
+            ./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;
+      };
+    };
 }
--- a/hosts/lazyworkhorse/configuration.nix
+++ b/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
--- a/hosts/uConsole/configuration.nix
+++ b/hosts/uConsole/configuration.nix
@@ -1,167 +0,0 @@
-{ config, lib, pkgs, paths, self, ... }:
-
-{
-  # Basic Host Info
-  networking.hostName = "uConsole";
-  time.timeZone = "America/Montreal";
-  i18n.defaultLocale = "en_CA.UTF-8";
-
-  # System State
-  system.stateVersion = "25.05";
-
-  # Boot & Hardware (uconsole-cm5 module handles boot.loader)
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # Networking
-  networking.networkmanager.enable = true;
-  services.openssh = {
-    enable = true;
-    settings.PermitRootLogin = "prohibit-password";
-    settings.PasswordAuthentication = false;
-  };
-
-  # User
-  users.users.gortium = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "video" "dialout" "kismet" ];
-    openssh.authorizedKeys.keys = [
-      keys.users.gortium.main
-      keys.users.gortium.gitea
-    ];
-  };
-  security.sudo.extraRules = [
-    {
-      users = [ "gortium" ];
-      commands = [
-        {
-          command = "ALL";
-          options = [ "NOPASSWD" ];
-        }
-      ];
-    }
-  ];
-
-  # ============================================================
-  # Package groups
-  # ============================================================
-
-  environment.systemPackages = with pkgs; [
-    # ===== Base =====
-    emacs-pgtk
-    git
-    ripgrep
-    fd
-    htop
-    tmux
-    neovim
-
-    # ===== HAM Radio =====
-    js8call
-    wsjtx
-    fldigi
-    pat                        # Winlink client
-    direwolf                   # AX.25 packet modem
-    chirp                      # Radio programming tool
-    hamlib                     # Ham radio control libraries
-    trustedqsl                 # Logbook of the World (LoTW)
-
-    # ===== SDR / RF =====
-    sdrpp                      # SDR++ spectrum analyzer
-    gqrx                       # SDR receiver GUI
-    rtl-sdr                    # RTL-SDR drivers & utilities
-    inspectrum                # Offline signal analysis
-    soapysdr-with-plugins      # SoapySDR + hardware support plugins
-
-    # ===== Mesh / LoRa =====
-    meshtastic                 # Python CLI for Meshtastic devices
-    reticulumStack             # Reticulum Network Stack (rnsd, rnsh, rncp, rnx, rnpath, etc.)
-    lxmf                       # LXMF messaging protocol
-    nomadnet                   # Nomad Network client
-
-    # ===== Security =====
-    nmap
-    aircrack-ng
-    kismet                     # Wi-Fi monitor / IDS
-    bettercap                  # MITM/network attack framework
-    wireshark                  # Packet analyzer
-    hashcat                    # GPU password cracker
-    john                       # John the Ripper
-    sqlmap                     # SQL injection tool
-
-    # ===== GPS / Maps =====
-    foxtrotgps
-    viking                     # GPS map editor
-    gpsbabel                   # GPS data conversion
-  ];
-
-  # Packages noted but not in unstable nixpkgs:
-  #   - metasploit: unfree; install manually via Git clone
-  #   - burpsuite: unfree Java app (Community Edition available for download)
-  #   - sidechannel: not a distinct PyPI package; functionality covered by
-  #     the Reticulum stack. For LXMF GUI client, install Sideband manually
-  #     from github.com/markqvist/Sideband
-
-  # ============================================================
-  # Reticulum Service (rnsd)
-  # ============================================================
-  systemd.services.rnsd = {
-    description = "Reticulum Network Stack Daemon";
-    after = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      User = "gortium";
-      Group = "gortium";
-      ExecStart = "${pkgs.reticulumStack}/bin/rnsd";
-      Restart = "always";
-      RestartSec = "10s";
-      LimitNOFILE = 65536;
-    };
-  };
-
-  # ============================================================
-  # Kismet Service (Wi-Fi monitoring / mesh node)
-  # ============================================================
-  systemd.services.kismet = {
-    description = "Kismet Wi-Fi Monitor & IDS";
-    after = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      User = "gortium";
-      Group = "kismet";
-      ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-base=/home/gortium/kismet_logs --no-nc-ui";
-      Restart = "always";
-      RestartSec = "10s";
-    };
-  };
-
-  # ============================================================
-  # Kernel modules for SDR and radio
-  # ============================================================
-  boot.kernelModules = [
-    "88x2bu"          # Realtek 8812/8821BU USB WiFi (common adapter)
-    "rtl8xxxu"        # RTL8188/8192/8723 USB WiFi
-    "rtl2832_sdr"     # RTL-SDR kernel module
-    "dvb_usb_rtl28xxu" # RTL-SDR DVB-T
-  ];
-
-  boot.blacklistedKernelModules = [ ];
-
-  # ============================================================
-  # Extra udev rules for SDR and HAM radio devices
-  # ============================================================
-  services.udev.packages = with pkgs; [ rtl-sdr ];
-
-  # ============================================================
-  # Enable IPv6 for Reticulum mesh
-  # ============================================================
-  networking.enableIPv6 = true;
-
-  # ============================================================
-  # Firewall: open ports for Reticulum (optional)
-  # ============================================================
-  networking.firewall.allowedTCPPorts = [ 22 ]; # SSH only
-  networking.firewall.allowedUDPPorts = [ ];
-  # Reticulum uses its own encryption and doesn't need open ports
-  # for basic mesh operations (peer-to-peer discovery).
-  # For TCP interfaces, open additional ports as needed.
-}
--- a/hosts/uconsole-cm5/configuration.nix
+++ b/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;
+  };
+
+
+}
--- a/hosts/uconsole-cm5/hardware-configuration.nix
+++ b/hosts/uconsole-cm5/hardware-configuration.nix
@@ -1,23 +1,27 @@
 { config, lib, pkgs, modulesPath, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
  boot.initrd.kernelModules = [ ];
  boot.extraModulePackages = [ ];

-  # uConsole CM5 uses NVMe or eMMC for boot storage
-  # The uconsole-cm5 module sets up /boot/firmware and default /
-  # Override device label here if using different storage
-  fileSystems."/" = lib.mkDefault {
-    device = "/dev/disk/by-label/NIXOS_UCM5";
+  # 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";
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./dotfiles.nix
+    ./systemd
+  ];
+}
--- a/modules/nixos/services/dotfiles.nix
+++ b/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);
+    };
+  };
+}
+
--- a/overlays/reticulum.nix
+++ b/overlays/reticulum.nix
@@ -1,77 +0,0 @@
-final: prev: let
-  python3 = final.python3;
-  pyPkgs = python3.pkgs;
-in {
-  reticulumStack = python3.pkgs.buildPythonApplication rec {
-    pname = "reticulum";
-    version = "1.2.9";
-    src = pyPkgs.fetchPypi {
-      pname = "rns";
-      inherit version;
-      sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75";
-    };
-    propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ];
-    doCheck = false;
-    pythonImportsCheck = [ "RNS" ];
-    meta = with final.lib; {
-      description = "Self-configuring, encrypted and resilient mesh networking stack";
-      homepage = "https://reticulum.network/";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  lxmf = python3.pkgs.buildPythonApplication rec {
-    pname = "lxmf";
-    version = "0.9.8";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
-    };
-    propagatedBuildInputs = [ final.reticulumStack ];
-    doCheck = false;
-    pythonImportsCheck = [ "LXMF" ];
-    meta = with final.lib; {
-      description = "Lightweight Extensible Message Format for Reticulum";
-      homepage = "https://github.com/markqvist/lxmf";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  nomadnet = python3.pkgs.buildPythonApplication rec {
-    pname = "nomadnet";
-    version = "1.1.1";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
-    };
-    propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ];
-    doCheck = false;
-    pythonImportsCheck = [ "nomadnet" ];
-    meta = with final.lib; {
-      description = "Nomad Network — resilient mesh communications platform";
-      homepage = "https://github.com/markqvist/NomadNet";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
-  rnsh = python3.pkgs.buildPythonApplication rec {
-    pname = "rnsh";
-    version = "0.1.7";
-    src = pyPkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
-    };
-    propagatedBuildInputs = [ final.reticulumStack ];
-    doCheck = false;
-    pythonImportsCheck = [ "rnsh" ];
-    meta = with final.lib; {
-      description = "Remote shell over Reticulum";
-      homepage = "https://github.com/acehoss/rnsh";
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-}
--- a/secrets/home_wifi.age
+++ b/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-----
--- a/secrets/secrets.nix
+++ b/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;
 }
--- a/users/gortium/default.nix
+++ b/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"];
--- a/users/gortium/home.nix
+++ b/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;
+}
Author	SHA1	Message	Date
Thierry Pouplier	38fabc348c	Merge branch 'uconsole-cm5-incremental' of ssh://code.lazyworkhorse.net:2222/gortium/infra into uconsole-cm5-incremental	2026-06-14 19:00:37 -04:00
Thierry Pouplier	5b3bd05bf4	Remove stale files..	2026-06-14 19:00:26 -04:00
aw	cbcabe89b6	remove hyperspace files accidentally committed from feat/hyperspace-pods-module These files were mixed into commit `16acc6a` which was intended to only fix SSH options for the uConsole configuration.	2026-06-14 18:58:35 -04:00
aw	7523a38be3	Merge remote-tracking branch 'origin/home_manager' into uconsole-cm5-incremental # Conflicts: # flake.lock # flake.nix # modules/nixos/services/default.nix	2026-06-14 18:53:53 -04:00
aw	86a4daacbb	chore: point nixos-uconsole input to pr/dcs-panel-detection branch	2026-06-14 18:43:04 -04:00
aw	723e5b1736	fix: add hyprwayland-scanner native paths for xdg-desktop-portal-hyprland cross-compile	2026-06-14 10:11:44 -04:00
aw	0bdf18ef12	fix: skip hyprland qtutils (Qt6Quick missing in aarch64 cross-compile) Qt6Quick and its submodules are not built in the aarch64 qtdeclarative cross-compile output. hyprland-qt-support can't find them and fails. Hyprland only needs qtutils at runtime (added to PATH via wrapProgram). Setting wrapRuntimeDeps = false skips the wrapping entirely, letting Hyprland build without its QML UI support package.	2026-06-14 10:01:28 -04:00
aw	91c6b4f2a7	fix: correct qtdeclarative attr to qt6.qtdeclarative	2026-06-14 09:56:31 -04:00
aw	ab22f85105	fix: set Qt6Qml_DIR for hyprland-qt-support cross-compile	2026-06-14 09:52:35 -04:00
aw	e498823ab6	fix: skip GTK tests in gjs cross-compile for Hyprland	2026-06-14 09:30:50 -04:00
aw	0672c26897	fix: remove libcamera from pipewire buildInputs (both overlays) meta.platforms = [] on libcamera doesn't help because nixos-25.11 pipewire has libcamera unconditionally in buildInputs. Must overrideAttrs to: - filter libcamera out of buildInputs - clear existing libcamera meson flags and set -Dlibcamera=disabled	2026-06-14 09:03:44 -04:00
aw	521829c487	fix: disable libcamera in pipewire via mesonFlags for both pkgs and rpi	2026-06-14 00:56:31 -04:00
aw	0e2f15a803	fix: force -Dlibcamera=disabled in pipewire mesonFlags for cross-compile	2026-06-14 00:16:09 -04:00
aw	7511fd24bb	fix: disable libcamera in pipewire for cross-compile (rpi-pisp blocks)	2026-06-13 23:45:58 -04:00
Hermes	4610a08072	feat: add Hyprland Wayland compositor from archive/uconsole-cm5-v3	2026-06-13 23:26:15 -04:00
Hermes	3f985c72de	switch to gortium/nixos-uconsole fork	2026-06-13 23:15:53 -04:00
Hermes	6543de3a45	fix: correct sd-image module to nixosModules.sd-image	2026-06-12 21:57:49 -04:00
Hermes	0db8071300	fix: correct sd-image module path	2026-06-12 21:56:22 -04:00
Hermes	9038863728	fix: remove dead rpi-pkgs line	2026-06-12 21:48:48 -04:00
Hermes	7e3b2520eb	fix: use nixos-raspberrypi.lib.nixosSystem + sd-image module directly	2026-06-12 21:47:29 -04:00
Hermes	80efb68428	feat(uconsole): add flashable SD image package (SSH+WiFi+keys)	2026-06-12 21:42:51 -04:00
Hermes	3d86af76b9	fix: remove non-existent ssh opts for nixpkgs-25.11	2026-06-12 20:55:42 -04:00
Hermes	656570b39e	fix: use plain string for bootloader setting	2026-06-12 20:54:19 -04:00
Hermes	8b6990ceee	deploy1(uconsole): revert rasberry-pi-5.base removal — keep minimal SSH+WiFi config	2026-06-12 20:52:11 -04:00
Hermes	a312c29221	fix: remove boot.loader.raspberry-pi reference (option removed with rasberry-pi-5.base)	2026-06-12 20:48:30 -04:00
Hermes	053dd535d3	deploy1(uconsole): minimal config — no rasberry-pi-5.base, just SSH + WiFi + keys	2026-06-12 20:47:11 -04:00
Hermes	35e4155b8c	fix(uconsole): remove configtxt module (conflicting overlays) — use extra-config only	2026-06-12 20:20:39 -04:00
Hermes	e8218c322a	fix(uconsole): set ignore_lcd=0 + disable conflicting dt-overlays	2026-06-12 20:19:21 -04:00
Hermes	931ed2ac27	fix(uconsole): clean config.txt — clear conflicting defaults, single [pi5] section	2026-06-12 20:16:50 -04:00
Hermes	052081616c	test: remove self.submodules to check Lix compatibility	2026-06-12 19:24:43 -04:00
Hermes	d3d7cdff44	Revert "fix: remove self.submodules (not supported by Lix)" This reverts commit `5202bc1fcb`.	2026-06-12 18:59:04 -04:00
Hermes	5202bc1fcb	fix: remove self.submodules (not supported by Lix)	2026-06-12 18:56:44 -04:00
Hermes	9319e32683	fix(uconsole): cross-compile Lix instead of using native aarch64 flake package	2026-06-12 18:41:44 -04:00
Hermes	7da46d5769	refactor(uconsole): use standard inject-overlays helpers instead of manual overlay list	2026-06-12 18:21:45 -04:00
Hermes	8ea6be7ac1	fix: remove rpi-cross-overlay import from uconsole-cm5 modules	2026-06-12 17:11:17 -04:00
Hermes	b455bf6866	chore: remove rpi-cross-overlay — fork nixpkgs-rpi.nix already handles cross-compile	2026-06-12 17:10:19 -04:00
Hermes	ce7c594562	feat: enable ca-derivations experimental feature on lazyworkhorse	2026-06-12 16:50:16 -04:00
Hermes	eb5e64ec67	Revert "chore: ignore hyperspace files from feat/hyperspace-pods-module" This reverts commit `ec44012a64`.	2026-06-12 16:47:15 -04:00
Hermes	ec44012a64	chore: ignore hyperspace files from feat/hyperspace-pods-module	2026-06-12 16:46:17 -04:00
Hermes	16acc6a153	fix(uconsole): resolve conflicting SSH options + properly override nixos-uconsole's nixos-raspberrypi input - mkForce on PermitRootLogin and PasswordAuthentication - nixos-uconsole.inputs.nixos-raspberrypi follows our fork	2026-06-12 16:43:33 -04:00
Hermes	5ee644e9dd	feat(uconsole): add rpi-cross-overlay module + Lix - rpi-cross-overlay.nix: override pkgs.rpi with cross-compilation when buildPlatform != hostPlatform (0 QEMU) - Lix nix daemon for uConsole (aarch64-linux) - Remove broken inline overlay from flake.nix	2026-06-12 16:36:49 -04:00
Thierry Pouplier	efc50d23c4	Added home wifi infos	2026-06-12 16:19:57 -04:00
Hermes	a527b65eae	fix(uconsole): rename secret to home_wifi (shared across hosts, not uconsole-specific)	2026-06-12 16:17:48 -04:00
Hermes	698d3f91eb	feat(uconsole): add agenix secret for WiFi credentials - age.secrets.uconsole-wifi (SSID+password in encrypted file) - systemd service ensure-wifi reads decrypted secret and configures NM - agenix.nixosModules.default imported for uconsole-cm5 - uconsole-wifi.age declared in secrets/secrets.nix	2026-06-12 16:15:37 -04:00
Hermes	1f99ca0d37	feat(uconsole): add cm5 cross-compiled nixosConfiguration - New host: uconsole-cm5 (aarch64-linux, cross-built from x86_64) - SSH authorizedKeys: gortium.main + ai-worker.main - NetworkManager enabled (WiFi password via agenix later) - Display: vc4/panel_cwu50/rp1_dsi with empty initrd - Config.txt [pi5] section (not [cm5]) - Backlight fix service - nixos-raspberrypi → gortium/cm5-cross-v1 fork (PR #197) - nixpkgs-uconsole pinned to nixos-25.11 (kernel patch compat) V3 branch saved as archive/uconsole-cm5-v3 (Reticulum/SDR/HAM config).	2026-06-12 16:02:13 -04:00
Thierry Pouplier	869d3957b5	Merge branch 'master' into home_manager	2025-08-24 22:26:12 -04:00
Thierry Pouplier	2eaffa8cfb	WIP on home manager	2025-08-19 17:32:38 -04:00