Merge branch 'fix/hermes-submodule-update' of ssh://code.lazyworkhorse.net:2222/gortium/infra into fix/hermes-submodule-update

chore: update compose submodule (openconcho ReactNode fix)
chore: update compose submodule (openconcho TS fix)
2026-07-07 20:53:28 -04:00 · 2026-07-07 20:52:41 -04:00 · 2026-07-07 20:50:05 -04:00 · 2026-07-07 20:47:16 -04:00 · 2026-07-07 20:43:09 -04:00 · 2026-07-07 20:15:36 -04:00
32 changed files with 570 additions and 1654 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
 [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
-	branch = master
--- a/assets/compose
+++ b/assets/compose
--- a/assets/dotfiles
+++ b/assets/dotfiles
--- a/flake.lock
+++ b/flake.lock
@@ -23,30 +23,6 @@
        "type": "github"
      }
    },
-    "agenix-rekey": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit-hooks": "pre-commit-hooks",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1774522439,
-        "narHash": "sha256-GvINrdGznE7mGlDNjW0/PMgOJlC+Nl9MkfxALB4QvWs=",
-        "owner": "oddlama",
-        "repo": "agenix-rekey",
-        "rev": "8b9c179bc1300ab130c90f2d25426bf0e7a2b58d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oddlama",
-        "repo": "agenix-rekey",
-        "type": "github"
-      }
-    },
    "argononed": {
      "flake": false,
      "locked": {
@@ -63,44 +39,23 @@
        "type": "github"
      }
    },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix-rekey",
-          "nixpkgs"
-        ]
-      },
+    "argononed_2": {
+      "flake": false,
      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "lastModified": 1729566243,
+        "narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
+        "owner": "nvmd",
+        "repo": "argononed",
+        "rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
+        "owner": "nvmd",
+        "repo": "argononed",
        "type": "github"
      }
    },
    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
      "flake": false,
      "locked": {
        "lastModified": 1751685974,
@@ -114,6 +69,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"
+      }
+    },
    "flake-compat_3": {
      "locked": {
        "lastModified": 1767039857,
@@ -129,46 +99,21 @@
        "type": "github"
      }
    },
-    "flake-parts": {
+    "flake-utils": {
      "inputs": {
-        "nixpkgs-lib": [
-          "agenix-rekey",
-          "nixpkgs"
-        ]
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix-rekey",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "numtide",
+        "repo": "flake-utils",
        "type": "github"
      }
    },
@@ -193,37 +138,16 @@
        "type": "github"
      }
    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-uconsole"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779506708,
-        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "lix": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "nix2container": "nix2container",
        "nix_2_18": "nix_2_18",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nixpkgs-regression": "nixpkgs-regression",
-        "pre-commit-hooks": "pre-commit-hooks_2"
+        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
        "lastModified": 1774721317,
@@ -300,6 +224,26 @@
        "type": "github"
      }
    },
+    "nixmate": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1771085058,
+        "narHash": "sha256-w9qE5zZ8mEHPbR84OuJoFWFvmMuKpvq/ANwyDUEvbPo=",
+        "owner": "daskladas",
+        "repo": "nixmate",
+        "rev": "9030841d4c3ec72359643d7af68bfdac428f1636",
+        "type": "github"
+      },
+      "original": {
+        "owner": "daskladas",
+        "repo": "nixmate",
+        "type": "github"
+      }
+    },
    "nixos-images": {
      "inputs": {
        "nixos-stable": [
@@ -326,50 +270,100 @@
        "type": "github"
      }
    },
-    "nixos-raspberrypi": {
+    "nixos-images_2": {
      "inputs": {
-        "argononed": "argononed",
-        "flake-compat": "flake-compat_3",
-        "nixos-images": "nixos-images",
-        "nixpkgs": [
-          "nixpkgs-uconsole"
+        "nixos-stable": [
+          "nixos-uconsole",
+          "nixos-raspberrypi",
+          "nixpkgs"
+        ],
+        "nixos-unstable": [
+          "nixos-uconsole",
+          "nixos-raspberrypi",
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1781324200,
-        "narHash": "sha256-JWqxN2Yle86+4Q+GFh12SvB92ZyLeqalVsN9lfMh6eQ=",
-        "owner": "gortium",
-        "repo": "nixos-raspberrypi",
-        "rev": "721a6e9e67dca3a23133db650b87018646bca3e6",
+        "lastModified": 1747747741,
+        "narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
+        "owner": "nvmd",
+        "repo": "nixos-images",
+        "rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
        "type": "github"
      },
      "original": {
-        "owner": "gortium",
-        "ref": "cm5-cross-v1",
+        "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"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779023229,
+        "narHash": "sha256-MInilg7B/06c34SwOuGSBho4l0H1EZcmvxTkSWCs5pE=",
+        "owner": "nvmd",
+        "repo": "nixos-raspberrypi",
+        "rev": "06c6e3513e1ee64b651913193fc6ac38aa4963f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvmd",
+        "ref": "v1.20260517.0",
+        "repo": "nixos-raspberrypi",
+        "type": "github"
+      }
+    },
+    "nixos-raspberrypi_2": {
+      "inputs": {
+        "argononed": "argononed_2",
+        "flake-compat": "flake-compat_3",
+        "nixos-images": "nixos-images_2",
+        "nixpkgs": [
+          "nixos-uconsole",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779023229,
+        "narHash": "sha256-MInilg7B/06c34SwOuGSBho4l0H1EZcmvxTkSWCs5pE=",
+        "owner": "nvmd",
+        "repo": "nixos-raspberrypi",
+        "rev": "06c6e3513e1ee64b651913193fc6ac38aa4963f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvmd",
+        "ref": "v1.20260517.0",
        "repo": "nixos-raspberrypi",
        "type": "github"
      }
    },
    "nixos-uconsole": {
      "inputs": {
-        "nixos-raspberrypi": [
-          "nixos-raspberrypi"
-        ],
+        "nixos-raspberrypi": "nixos-raspberrypi_2",
        "nixpkgs": [
-          "nixpkgs-uconsole"
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1781476310,
-        "narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
-        "owner": "gortium",
+        "lastModified": 1780333979,
+        "narHash": "sha256-yjp/gWRqWCxalYLe2+27gbxhttL+46Ozm7qvccpFbv4=",
+        "owner": "nixos-uconsole",
        "repo": "nixos-uconsole",
-        "rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
+        "rev": "1e6a8dc51c7b26e15850688a0b01121c3fea4b30",
        "type": "github"
      },
      "original": {
-        "owner": "gortium",
-        "ref": "pr/dcs-panel-detection",
+        "owner": "nixos-uconsole",
        "repo": "nixos-uconsole",
        "type": "github"
      }
@@ -406,23 +400,23 @@
        "type": "github"
      }
    },
-    "nixpkgs-uconsole": {
+    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1780952837,
-        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
+        "lastModified": 1770562336,
+        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
+        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1774386573,
        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
@@ -439,29 +433,6 @@
      }
    },
    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "agenix-rekey",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks_2": {
      "flake": false,
      "locked": {
        "lastModified": 1769939035,
@@ -480,13 +451,32 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
-        "agenix-rekey": "agenix-rekey",
-        "home-manager": "home-manager_2",
        "lix": "lix",
+        "nixmate": "nixmate",
        "nixos-raspberrypi": "nixos-raspberrypi",
        "nixos-uconsole": "nixos-uconsole",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-uconsole": "nixpkgs-uconsole"
+        "nixpkgs": "nixpkgs_3"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixmate",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770606655,
+        "narHash": "sha256-rpJf+kxvLWv32ivcgu8d+JeJooog3boJCT8J3joJvvM=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "11a396520bf911e4ed01e78e11633d3fc63b350e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
      }
    },
    "systems": {
@@ -504,24 +494,18 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix-rekey",
-          "nixpkgs"
-        ]
-      },
+    "systems_2": {
      "locked": {
-        "lastModified": 1735135567,
-        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "nix-systems",
+        "repo": "default",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@@ -2,41 +2,29 @@
  description = "Gortium infra flake";

  inputs = {
+    nixmate.url = "github:daskladas/nixmate";
    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
    agenix = {
      url = "github:ryantm/agenix";
      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";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
-      inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
+      url = "github:nixos-uconsole/nixos-uconsole";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixos-raspberrypi = {
-      url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+      url = "github:nvmd/nixos-raspberrypi/v1.20260517.0";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
    self.submodules = true;
-    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
-      inputs.nixpkgs.follows = "nixpkgs-uconsole";
-    };
  };

-  outputs = { self, nixpkgs, agenix, agenix-rekey, lix
-            , nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
-            , home-manager
-            , ... }@inputs:
+  outputs = { self, nixmate, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
    let
      system = "x86_64-linux";
      keys = import ./lib/keys.nix;
@@ -47,275 +35,81 @@
          "/etc/ssh/ssh_host_ed25519_key"
          "/root/.age/bootstrap.key" ];
      };
-      overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
+      overlays = [
+        agenix.overlays.default
+        (import ./overlays/reticulum.nix)
+        (import ./overlays/nixmate.nix inputs)
+      ];
      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;
      };
-
-       ##############################################################################
-      # 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: {
-          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-cm5-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
+      {
+        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
+            ];
          };
-        in { nix.package = lixCross.lix; })
-        inputs.home-manager.nixosModules.home-manager
-        agenix.nixosModules.default
-        agenix-rekey.nixosModules.default
-        ./hosts/uconsole-cm5/configuration.nix
-        ./hosts/uconsole-cm5/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; };
-          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;
-            }
-            inputs.home-manager.nixosModules.home-manager
-            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/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/security/ai-worker-restricted.nix
-            ./users/gortium/gortium.nix
-            ./users/ai-worker/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
-            ./modules/nixos/services/remote-builder.nix
-        ./modules/nixos/services/wireguard-client.nix
-            ./users/gortium/gortium.nix
-          ];
-        };
-
-        uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
-          system = "aarch64-linux";
-          specialArgs = {
-            inherit self keys paths inputs;
-            nixos-raspberrypi = nixos-raspberrypi;
-            isCM4 = false;
+          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
+            ];
          };
-          modules = uconsoleBaseModules;
-        };
-      };

-      agenix-rekey = agenix-rekey.configure {
-        userFlake = self;
-        nixosConfigurations = self.nixosConfigurations;
-      };
-
-      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;
+          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
+            ];
          };
-          modules = uconsoleBaseModules ++ [
-            nixos-raspberrypi.nixosModules.sd-image
-          ];
-        }).config.system.build.sdImage;
+        };
+        devShells.${system}.default = devShell;
      };
-    };
 }
--- a/hosts/cyt-pi/configuration.nix
+++ b/hosts/cyt-pi/configuration.nix
@@ -50,7 +50,7 @@
      User = "gortium";
      Group = "kismet";
      ExecStart = ''
-        ${pkgs.kismet}/bin/kismet -c panda --log-prefix=/home/gortium/kismet_logs --no-nc-ui
+        ${pkgs.kismet}/bin/kismet -c panda --log-base=/home/gortium/kismet_logs --no-nc-ui
      '';
      Restart = "always";
      RestartSec = "10s";
--- a/hosts/lazyworkhorse/configuration.nix
+++ b/hosts/lazyworkhorse/configuration.nix
@@ -9,8 +9,12 @@
  hoardingcow-mount.enable = true;

  # Flakesss
-  nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
+  nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
  nix.settings.trusted-users = [ "root" "gortium" ];
+  nix.settings.extra-platforms = [ "aarch64-linux" ];
+
+  # QEMU binfmt for cross-building aarch64 NixOS targets
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];

  # Garbage collection
  nix.gc = {
@@ -49,12 +53,24 @@
  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
  networking.hostId = "deadbeef";

-  # WireGuard VPN client -- module, always up, connects to wg-easy server
-  gortium.wireguard-client = {
-    enable = true;
-    vpnIp = "10.8.0.3/24";
-    privateKeyFile = config.age.secrets.wireguard_private_key.path;
-    presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
+  # WireGuard VPN client -- always up, connects to wg-easy server
+  # Create age-encrypted secrets before deploying (run on the host):
+  #   echo -n "<private_key>" | agenix -e secrets/wireguard_private_key.age
+  #   echo -n "<preshared_key>" | agenix -e secrets/wireguard_preshared_key.age
+  networking.wireguard.interfaces = {
+    wg0 = {
+      ips = [ "10.8.0.3/24" ];
+      privateKeyFile = config.age.secrets.wireguard_private_key.path;
+      peers = [
+        {
+          publicKey = "rY9zII3AOm8rog2rv02PyA3Bq7zdvTOGkZapfCV1DkE=";
+          presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
+          allowedIPs = [ "10.8.0.0/24" ];
+          endpoint = "vpn.lazyworkhorse.net:51820";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
  };

  # Set your time zone.
@@ -128,12 +144,14 @@
  # You can use https://Search.nixos.org/ to find more packages (and options).
  environment.systemPackages = with pkgs; [
    neovim
+    tmux
    docker-compose
    wget
    age
    agenix
    git
    nh
+    nixmate
    lm_sensors
    rocmPackages.rocminfo
    rocmPackages.rocm-smi
@@ -166,9 +184,9 @@
    settings = {
      PasswordAuthentication = false;
      KbdInteractiveAuthentication = false;
-  # ============================================================
-  # ClamAV antivirus — daemon, hourly updates, daily scan, on-access
-  # ============================================================
+      # Additional hardening settings below in SERVER HARDENING section
+    };
+    hostKeys = [
      {
        path = "/etc/ssh/ssh_host_ed25519_key";
        type = "ed25519";
@@ -240,12 +258,6 @@
    # };
  };

-  services.opencode = {
-    enable = true;
-    port = 4099;
-    ollamaUrl = "http://127.0.0.1:11434/v1"; 
-  };
-  
  # Private host ssh key managed by agenix
  age = {
    identityPaths = paths.identities;
@@ -295,16 +307,6 @@
    };
  };

-  # 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)
  environment.etc."ssh/ssh_host_ed25519_key.pub".text =
    "${keys.hosts.lazyworkhorse.main}";
@@ -337,16 +339,6 @@
  # networking.firewall.enable = false;

  # =============================================================================
-  # ============================================================
-  # ClamAV antivirus — daemon, hourly updates, daily scan, on-access
-  # ============================================================
-  gortium.clamav = {
-    enable = true;
-    enableDaemon = true;
-    onAccessScanning = true;
-    dailyScanTime = "03:00";
-  };
-
  # SERVER HARDENING - Firewall, Fail2ban, SSH, Kernel
  # =============================================================================
  
--- a/hosts/uConsole/configuration.nix
+++ b/hosts/uConsole/configuration.nix
@@ -0,0 +1,171 @@
+{ config, lib, pkgs, paths, self, keys, ... }:
+
+{
+  # Basic Host Info
+  networking.hostName = "uConsole";
+  time.timeZone = "America/Montreal";
+  i18n.defaultLocale = "en_CA.UTF-8";
+
+  # System State
+  system.stateVersion = "25.05";
+
+  # Boot & Hardware (migrated to kernel bootloader per nixos-raspberrypi deprecation notice)
+  boot.loader.raspberry-pi.bootloader = "kernel";
+  # kernel managed by nixos-raspberrypi module — don't override, patches are version-specific
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # Networking
+  networking.networkmanager.enable = true;
+  services.openssh = {
+    enable = true;
+    settings.PermitRootLogin = lib.mkForce "prohibit-password";
+    settings.PasswordAuthentication = lib.mkForce 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";
+    wants = [ "network-online.target" ];
+    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";
+    wants = [ "network-online.target" ];
+    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/hardware-configuration.nix
+++ b/hosts/uconsole-cm5/hardware-configuration.nix
@@ -1,27 +1,23 @@
 { 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 = [ ];

-  # SD card partitions (nixos-uconsole layout)
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXOS_SD";
+  # 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";
    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/hosts/uconsole-cm5/configuration.nix
+++ b/hosts/uconsole-cm5/configuration.nix
@@ -1,62 +0,0 @@
-{ config, lib, pkgs, keys, ... }:
-
-{
-  networking.hostName = "uConsole";
-  time.timeZone = "America/Montreal";
-  i18n.defaultLocale = "en_CA.UTF-8";
-  system.stateVersion = "25.11";
-
-  # SSH — root access avec clés gortium + ai-worker
-  services.openssh = {
-    enable = true;
-    settings = {
-      PermitRootLogin = lib.mkForce "prohibit-password";
-      PasswordAuthentication = lib.mkForce false;
-    };
-  };
-
-  users.users.root.openssh.authorizedKeys.keys = with keys; [
-    users.gortium.main
-    users.ai-worker.main
-  ];
-
-  # AI worker user (Hermes SSH access)
-  users.users.ai-worker = {
-    isNormalUser = false;
-    shell = pkgs.bash;
-    openssh.authorizedKeys.keys = with keys; [
-      users.ai-worker.main
-    ];
-  };
-
-  # Age secret for gortium password (file created by user)
-  age.secrets.gortium_password = {
-    file = ../secrets/gortium_password.age;
-  };
-
-  # Password file for gortium (merges with users/gortium/default.nix)
-
-  # 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;
-  };
-
-  # HackerGadgets AIO v2 board — GPIO rail control, aiov2_ctl CLI
-  hardware.uconsole-cm5-aio-v2 = {
-    enable = true;
-    bootRails = {
-      GPS  = false;
-      LORA = false;
-      SDR  = false;
-      USB  = false;
-    };
-    enableGPS = false;
-  };
-}
--- a/modules/nixos/filesystem/poup-16t-disk.nix
+++ b/modules/nixos/filesystem/poup-16t-disk.nix
@@ -1,121 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.gortium.poup16t;
-  luksName = cfg.luksName;
-in
-with lib;
-
-{
-  options.gortium.poup16t = {
-    enable = mkEnableOption "Poup_16T storage disk (btrfs + LUKS + btrbk snapshots)";
-
-    luksUuid = mkOption {
-      type = types.str;
-      description = ''
-        UUID of the LUKS partition on the 16TB disk (WD Red Pro).
-
-        Find this by running as root when the disk is connected:
-          blkid /dev/sdb   # or wherever the disk appears
-          lsblk -o NAME,SIZE,FSTYPE,UUID
-
-        Since btrfs is inside LUKS, the FS UUID is hidden — use the
-        LUKS partition UUID from blkid (it'll show TYPE=\"crypto_LUKS\").
-      '';
-      example = "00000000-0000-0000-0000-000000000000";
-    };
-
-    luksName = mkOption {
-      type = types.str;
-      default = "poup_16t";
-      description = "Name for the LUKS /dev/mapper/ mapping";
-    };
-
-    mountPoint = mkOption {
-      type = types.str;
-      default = "/mnt/Poup_16T";
-      description = "Mount point for the 16TB data disk";
-    };
-
-    btrfsOptions = mkOption {
-      type = types.listOf types.str;
-      default = [ "defaults" "noatime" "compress=zstd:3" "nofail" ];
-      description = "Mount options for the btrfs filesystem. 'nofail' ensures boot succeeds when disk is disconnected.";
-    };
-
-    btrbk = {
-      enable = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Enable btrbk snapshot management on this volume";
-      };
-
-      schedule = mkOption {
-        type = types.str;
-        default = "daily";
-        description = "systemd calendar event for btrbk (e.g. 'daily', 'hourly', '*-*-* 00:00:00')";
-      };
-
-      preserveMin = mkOption {
-        type = types.str;
-        default = "2d";
-        description = "btrbk snapshot_preserve_min — minimum age before pruning";
-      };
-
-      preserve = mkOption {
-        type = types.str;
-        default = "14d 4w 3m";
-        description = "btrbk snapshot_preserve — retention policy (daily, weekly, monthly)";
-      };
-
-      snapshotDir = mkOption {
-        type = types.str;
-        default = ".snapshots";
-        description = "Directory name for snapshots relative to volume root";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Enable btrfs kernel support (no DKMS needed — it's in-tree)
-    boot.supportedFilesystems = [ "btrfs" ];
-
-    # Install btrfs administration tools
-    environment.systemPackages = with pkgs; [
-      btrfs-progs       # mkfs.btrfs, btrfs, fsck, balance, scrub
-      btrbk             # Snapshot management + rotation
-    ];
-
-    # LUKS2 unlock at boot (uses keyfile or prompts if unavailable)
-    # Since the disk may be disconnected, initrd times out gracefully (~30s)
-    boot.initrd.luks.devices.${luksName} = {
-      device = "/dev/disk/by-uuid/${cfg.luksUuid}";
-      preLVM = false;
-      allowDiscards = true;
-    };
-
-    # Mount the unlocked mapper device as btrfs
-    fileSystems.${cfg.mountPoint} = {
-      device = "/dev/mapper/${luksName}";
-      fsType = "btrfs";
-      options = cfg.btrfsOptions;
-    };
-
-    # btrbk — automated snapshot creation and rotation
-    services.btrbk = mkIf cfg.btrbk.enable {
-      instances.poup16t = {
-        onCalendar = cfg.btrbk.schedule;
-        settings = {
-          snapshot_preserve_min = cfg.btrbk.preserveMin;
-          snapshot_preserve = cfg.btrbk.preserve;
-
-          volume.${cfg.mountPoint} = {
-            snapshot_create = "always";
-            snapshot_dir = cfg.btrbk.snapshotDir;
-            subvolume = ".";
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
+++ b/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
@@ -1,169 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.hardware.uconsole-cm5-aio-v2;
-
-  # GPIO pin map matching the AIO v2 board hardware
-  #   SDR  (RTL-SDR):  GPIO 7
-  #   LoRa (SX1262) :  GPIO 16
-  #   USB Hub Interne: GPIO 23
-  #   GPS (GNSS)    :  GPIO 27
-  gpioMap = {
-    GPS  = 27;
-    LORA = 16;
-    SDR  = 7;
-    USB  = 23;
-  };
-
-  # Generate a script that applies boot rail states via pinctrl
-  applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" (
-    ''
-      set -e
-      PINCTRL=${pkgs.raspberrypi-utils}/bin/pinctrl
-    ''
-    + concatStringsSep "" (mapAttrsToList (name: pin: ''
-      if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then
-        echo "AIO v2: ${name} (GPIO${toString pin}) -> ON"
-        $PINCTRL set ${toString pin} op dh
-      else
-        echo "AIO v2: ${name} (GPIO${toString pin}) -> OFF"
-        $PINCTRL set ${toString pin} op dl
-      fi
-    '') gpioMap)
-  );
-
-  # aiov2_ctl CLI tool -- fetched from GitHub, available as `aiov2_ctl`
-  aiov2CtlPkg = pkgs.stdenv.mkDerivation rec {
-    pname = "aiov2_ctl";
-    version = "0-unstable-2026-06-16";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "hackergadgets";
-      repo = "aiov2_ctl";
-      rev = "main";
-      hash = "sha256-hqOvS1K5pDVXAroUE50i5R9YqRgC2U3fzby6uuB67K0=";
-    };
-
-    dontUnpack = true;
-
-    installPhase = ''
-      mkdir -p $out/bin $out/share/aiov2_ctl/img
-      cp $src/aiov2_ctl.py $out/bin/aiov2_ctl
-      chmod +x $out/bin/aiov2_ctl
-      patchShebangs $out/bin/aiov2_ctl
-      substituteInPlace $out/bin/aiov2_ctl \
-        --replace-fail '"/usr/local/share/aiov2_ctl/img/' '"'$out'/share/aiov2_ctl/img/'
-      cp -r $src/img/* $out/share/aiov2_ctl/img/
-    '';
-
-    meta = {
-      description = "HackerGadgets uConsole AIO v2 GPIO control and telemetry tool";
-      homepage = "https://github.com/hackergadgets/aiov2_ctl";
-      license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ ];
-      platforms = [ "aarch64-linux" ];
-    };
-  };
-in {
-  options.hardware.uconsole-cm5-aio-v2 = {
-    enable = mkEnableOption "HackerGadgets uConsole AIO v2 board support";
-
-    bootRails = {
-      GPS = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable GPS module at boot (GPIO 27)";
-      };
-      LORA = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable LoRa module at boot (GPIO 16)";
-      };
-      SDR = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable SDR module at boot (GPIO 7)";
-      };
-      USB = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable internal USB hub at boot (GPIO 23)";
-      };
-    };
-
-    package = mkOption {
-      type = types.package;
-      default = aiov2CtlPkg;
-      defaultText = literalExpression "aiov2CtlPkg";
-      description = "aiov2_ctl package to use";
-    };
-
-    enableGPS = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Enable GPS UART (/dev/ttyAMA0 at 9600 baud).
-        Requires enabling UART on the CM5 via boot.kernelParams.
-      '';
-    };
-
-    enableGUI = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Enable the system tray GUI for aiov2_ctl.
-        Requires a desktop environment with system tray support.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Package the aiov2_ctl tool + pinctrl
-    environment.systemPackages = with pkgs; [
-      cfg.package
-      raspberrypi-utils  # provides pinctrl
-    ];
-
-    # Boot rail systemd oneshot service
-    systemd.services.aiov2-rails-boot = {
-      description = "Apply AIO v2 GPIO rail boot states";
-      after = [ "local-fs.target" ];
-      wants = [ "local-fs.target" ];
-      before = [ "multi-user.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = "${applyRailsScript}";
-        RemainAfterExit = true;
-      };
-    };
-
-    # GPS configuration
-    boot.kernelParams = mkIf cfg.enableGPS [ "uart0=on" ];
-
-    users.users = mkIf cfg.enableGPS {
-      gortium = {
-        extraGroups = [ "dialout" ];
-      };
-    };
-
-    # GUI autostart (XDG)
-    systemd.user.services.aiov2-ctl-gui = mkIf cfg.enableGUI {
-      description = "AIO v2 System Tray Controller";
-      after = [ "graphical-session.target" ];
-      wants = [ "graphical-session.target" ];
-      wantedBy = [ "graphical-session.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${cfg.package}/bin/aiov2_ctl --gui";
-        Restart = "on-failure";
-        RestartSec = 5;
-      };
-      environment = {
-        AIOV2_CTL_DEBUG = "0";
-      };
-    };
-  };
-}
--- a/modules/nixos/services/clamav.nix
+++ b/modules/nixos/services/clamav.nix
@@ -1,240 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.gortium.clamav;
-  clamavPkg = pkgs.clamav;
-
-  clamdConfig = pkgs.writeText "clamd.conf" ''
-    LogFile /var/log/clamav/clamd.log
-    LogTime yes
-    LogVerbose yes
-    LogSyslog yes
-    LocalSocket /run/clamav/clamd.sock
-    TCPSocket 3310
-    TCPAddr 127.0.0.1
-    User clamav
-    AllowSupplementaryGroups yes
-    ${cfg.clamdExtraConfig}
-  '';
-
-  freshclamConfig = pkgs.writeText "freshclam.conf" ''
-    DatabaseDirectory /var/lib/clamav
-    LogFile /var/log/clamav/freshclam.log
-    LogTime yes
-    LogVerbose yes
-    LogSyslog yes
-    User clamav
-    AllowSupplementaryGroups yes
-    ${cfg.freshclamExtraConfig}
-  '';
-
-  # Daily scan — logging only, no auto-quarantine/delete
-  scanScript = pkgs.writeShellScript "clamav-daily-scan" ''
-    set -e
-    PATHS="${concatStringsSep " " cfg.scanPaths}"
-    if [ -z "$PATHS" ]; then
-      echo "No paths configured for daily scan"
-      exit 0
-    fi
-    echo "=== ClamAV daily scan started: $(date) ==="
-    ${clamavPkg}/bin/clamdscan --fdpass --log=/var/log/clamav/daily-scan.log --no-summary $PATHS
-    echo "=== ClamAV daily scan finished: $(date) ==="
-  '';
-in
-{
-  ##### Options #####
-  options.gortium.clamav = {
-    enable = mkEnableOption "ClamAV antivirus — installs clamav CLI tools";
-
-    enableDaemon = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Run clamd daemon + freshclam updater + daily scheduled scan.
-        Set to false on machines where you only want the CLI tools
-        (clamscan, clamdscan) for manual on-demand scanning.
-      '';
-    };
-
-    onAccessScanning = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Enable on-access scanning via clamonacc (fanotify-based).
-        Resource-heavy; server use only. Requires enableDaemon = true.
-      '';
-    };
-
-    scanPaths = mkOption {
-      type = types.listOf types.str;
-      default = [
-        "/home"
-        "/nix/store"
-        "/var/lib"
-        "/etc"
-        "/tmp"
-        "/var/tmp"
-      ];
-      description = "Paths for the daily scheduled scan.";
-    };
-
-    dailyScanTime = mkOption {
-      type = types.str;
-      default = "daily";
-      description = ''
-        When to run the daily scan. systemd calendar expression
-        or shortcuts like "daily", "weekly", "04:00".
-      '';
-    };
-
-    clamdExtraConfig = mkOption {
-      type = types.lines;
-      default = "";
-      description = "Extra lines appended to clamd.conf";
-    };
-
-    freshclamExtraConfig = mkOption {
-      type = types.lines;
-      default = "";
-      description = "Extra lines appended to freshclam.conf";
-    };
-  };
-
-  ##### Implementation #####
-  config = mkIf cfg.enable {
-    # 1. Package — always installed when enable = true
-    environment.systemPackages = [ clamavPkg ];
-
-    # Everything below uses mkIf cfg.enableDaemon — conditionalized per attribute
-
-    # 2. Users/groups (only if daemon runs)
-    users.users.clamav = mkIf cfg.enableDaemon {
-      isSystemUser = true;
-      group = "clamav";
-      home = "/var/lib/clamav";
-      createHome = true;
-      description = "ClamAV daemon user";
-    };
-    users.groups.clamav = mkIf cfg.enableDaemon {};
-
-    # 3. Directories (only if daemon runs)
-    systemd.tmpfiles.rules = mkIf cfg.enableDaemon [
-      "d /var/lib/clamav 0750 clamav clamav -"
-      "d /var/log/clamav 0750 clamav clamav -"
-      "d /run/clamav 0755 clamav clamav -"
-    ];
-
-    # 4. ClamAV daemon (clamd)
-    systemd.services.clamav-daemon = mkIf cfg.enableDaemon {
-      description = "ClamAV Anti-Virus Daemon";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ clamavPkg ];
-
-      preStart = ''
-        mkdir -p /var/lib/clamav /var/log/clamav /run/clamav
-        chown clamav:clamav /var/lib/clamav /var/log/clamav /run/clamav
-      '';
-
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${clamavPkg}/bin/clamd --config-file=${clamdConfig}";
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        Restart = "on-failure";
-        RestartSec = "10s";
-        User = "clamav";
-        Group = "clamav";
-        RuntimeDirectory = "clamav";
-        RuntimeDirectoryMode = "0755";
-        StateDirectory = "clamav";
-        StateDirectoryMode = "0750";
-        LogsDirectory = "clamav";
-        LogsDirectoryMode = "0750";
-        PrivateTmp = true;
-        ProtectSystem = "strict";
-        ProtectHome = true;
-        ReadWritePaths = [
-          "/var/lib/clamav"
-          "/var/log/clamav"
-          "/run/clamav"
-        ];
-        NoNewPrivileges = true;
-      };
-    };
-
-    # 5. freshclam (database updater) — hourly via timer
-    systemd.services.clamav-freshclam = mkIf cfg.enableDaemon {
-      description = "ClamAV Virus Database Updater";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ clamavPkg pkgs.curl ];
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = "${clamavPkg}/bin/freshclam --config-file=${freshclamConfig} --daemon-notify=${clamdConfig}";
-        User = "clamav";
-        Group = "clamav";
-        PrivateTmp = true;
-        ProtectSystem = "full";
-        NoNewPrivileges = true;
-      };
-    };
-    systemd.timers.clamav-freshclam = mkIf cfg.enableDaemon {
-      description = "ClamAV database update timer";
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnCalendar = "hourly";
-        Persistent = true;
-        RandomizedDelaySec = "1800";
-      };
-    };
-
-    # 6. Daily scan — logging only, no auto-quarantine
-    systemd.services.clamav-daily-scan = mkIf cfg.enableDaemon {
-      description = "ClamAV Daily Scheduled Scan";
-      after = [ "clamav-daemon.service" ];
-      requires = [ "clamav-daemon.service" ];
-      path = [ clamavPkg ];
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = "${scanScript}";
-        User = "clamav";
-        Group = "clamav";
-        PrivateTmp = true;
-        ProtectSystem = "strict";
-        ReadWritePaths = [ "/var/log/clamav" ];
-      };
-    };
-    systemd.timers.clamav-daily-scan = mkIf cfg.enableDaemon {
-      description = "ClamAV daily scan timer";
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnCalendar = cfg.dailyScanTime;
-        Persistent = true;
-      };
-    };
-
-    # 7. On-access scanning (clamonacc) — needs enableDaemon
-    systemd.services.clamav-onaccess = mkIf (cfg.enableDaemon && cfg.onAccessScanning) {
-      description = "ClamAV On-Access Scanner (clamonacc)";
-      after = [ "clamav-daemon.service" ];
-      requires = [ "clamav-daemon.service" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ clamavPkg ];
-
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${clamavPkg}/bin/clamonacc --config-file=${clamdConfig} --fdpass --log=/var/log/clamav/clamonacc.log";
-        Restart = "on-failure";
-        RestartSec = "10s";
-        User = "root";  # clamonacc needs root for fanotify
-        Group = "root";
-        PrivateTmp = true;
-        NoNewPrivileges = true;
-      };
-    };
-  };
-}
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./systemd
-  ];
-}
--- a/modules/nixos/services/remote-builder.nix
+++ b/modules/nixos/services/remote-builder.nix
@@ -1,71 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.services.remoteBuilder;
-in {
-  options.services.remoteBuilder = {
-    enable = lib.mkEnableOption "remote Nix build machine (lazyworkhorse server)";
-
-    buildMachine = {
-      host = lib.mkOption {
-        type = lib.types.str;
-        default = "lazyworkhorse.net";
-        description = "Hostname or IP of the remote build machine.";
-      };
-      sshUser = lib.mkOption {
-        type = lib.types.str;
-        default = "ai-worker";
-        description = "SSH user on the remote build machine.";
-      };
-      port = lib.mkOption {
-        type = lib.types.port;
-        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" "x86_64-linux" ];
-        description = "System types the remote builder can build for.";
-      };
-      maxJobs = lib.mkOption {
-        type = lib.types.int;
-        default = 16;
-        description = "Max parallel jobs on the remote builder.";
-      };
-      supportedFeatures = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ "big-parallel" "nixos-test" "benchmark" ];
-        description = "Features the remote builder supports.";
-      };
-    };
-
-    fallbackLocal = lib.mkOption {
-      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 = [{
-      hostName = cfg.buildMachine.host;
-      sshUser = cfg.buildMachine.sshUser;
-      systems = cfg.buildMachine.systems;
-      maxJobs = cfg.buildMachine.maxJobs;
-      supportedFeatures = cfg.buildMachine.supportedFeatures;
-    }];
-
-    nix.extraOptions = lib.optionalString cfg.fallbackLocal ''
-      builders-use-substitutes = true
-      fallback = true
-    '';
-
-    # SSH config for the remote builder (since nix.buildMachines has no port option)
-    programs.ssh.extraConfig = ''
-      Host ${cfg.buildMachine.host}
-        HostName ${cfg.buildMachine.host}
-        Port ${toString cfg.buildMachine.port}
-        User ${cfg.buildMachine.sshUser}
-    '';
-  };
-}
--- a/modules/nixos/services/staging-vm.nix.bak
+++ b/modules/nixos/services/staging-vm.nix.bak
@@ -1,275 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.stagingVm;
-in
-{
-  options.services.stagingVm = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable KVM/libvirt staging VM for compose PR testing";
-    };
-
-    vmName = mkOption {
-      type = types.str;
-      default = "compose-test-vm";
-      description = "Name of the staging VM";
-    };
-
-    memory = mkOption {
-      type = types.str;
-      default = "4096";
-      description = "RAM allocated to the staging VM (MB)";
-    };
-
-    vcpus = mkOption {
-      type = types.int;
-      default = 2;
-      description = "Number of vCPUs for the staging VM";
-    };
-
-    storagePath = mkOption {
-      type = types.str;
-      default = "/var/lib/libvirt/images";
-      description = "Path for libvirt storage pool";
-    };
-
-    dataPath = mkOption {
-      type = types.str;
-      default = "/var/lib/staging-vm";
-      description = "Path for compose test data (PR checkouts, test results)";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Enable libvirt daemon
-    virtualisation.libvirtd = {
-      enable = true;
-      qemu = {
-        package = pkgs.qemu_kvm;
-        runAsRoot = true;
-        swtpm.enable = true;
-        ovmf = {
-          enable = true;
-          packages = [ pkgs.OVMFFull.fd ];
-        };
-      };
-    };
-
-    # Kernel modules + groups already handled in configuration.nix
-
-    # libvirt NAT network (192.168.122.0/24)
-    environment.etc."libvirt/qemu/networks/default.xml" = {
-      text = ''
-        <network>
-          <name>default</name>
-          <uuid>2b8f7a3c-9e5d-4a1f-bc3d-6e7a8f9b0c1d</uuid>
-          <forward mode='nat'>
-            <nat>
-              <port start='1024' end='65535'/>
-            </nat>
-          </forward>
-          <bridge name='virbr0' stp='on' delay='0'/>
-          <mac address='52:54:00:12:34:56'/>
-          <ip address='192.168.122.1' netmask='255.255.255.0'>
-            <dhcp>
-              <range start='192.168.122.2' end='192.168.122.254'/>
-            </dhcp>
-          </ip>
-        </network>
-      '';
-      # Autostart the network so it comes up on boot
-      mode = "0644";
-    };
-
-    # Ensure the default network is defined and autostarted
-    systemd.services.libvirtd = {
-      postStart = ''
-        ${pkgs.libvirt}/bin/virsh net-define /etc/libvirt/qemu/networks/default.xml 2>/dev/null || true
-        ${pkgs.libvirt}/bin/virsh net-autostart default 2>/dev/null || true
-        ${pkgs.libvirt}/bin/virsh net-start default 2>/dev/null || true
-      '';
-    };
-
-    # Storage directory for VM images
-    systemd.tmpfiles.rules = [
-      "d ${cfg.storagePath} 0755 root root -"
-      "d ${cfg.dataPath} 0755 root root -"
-    ];
-
-    # Ensure storage pool exists in libvirt
-    systemd.services.libvirtd.postStart = mkAfter ''
-      ${pkgs.libvirt}/bin/virsh pool-define-as default dir --target "${cfg.storagePath}" 2>/dev/null || true
-      ${pkgs.libvirt}/bin/virsh pool-autostart default 2>/dev/null || true
-      ${pkgs.libvirt}/bin/virsh pool-start default 2>/dev/null || true
-    '';
-
-    # Firewall: allow traffic from virbr0 to host and outbound NAT
-    networking.firewall = {
-      extraCommands = ''
-        # Allow inbound DHCP/DNS from libvirt guests
-        iptables -I INPUT -i virbr0 -p udp --dport 67:68 -j ACCEPT
-        iptables -I INPUT -i virbr0 -p tcp --dport 53 -j ACCEPT
-        iptables -I INPUT -i virbr0 -p udp --dport 53 -j ACCEPT
-        
-        # Allow established/related traffic back to guests
-        iptables -I FORWARD -i virbr0 -o virbr0 -j ACCEPT
-        iptables -I FORWARD -o virbr0 -j ACCEPT
-        iptables -I FORWARD -i virbr0 -j ACCEPT
-      '';
-    };
-
-    # Packages needed for VM management
-    environment.systemPackages = with pkgs; [
-      libvirt
-      qemu_kvm
-      virt-manager  # optional GUI for manual management
-      OVMFFull
-      swtpm
-    ];
-
-    # Enable docker in the host (already enabled, but ensure for compose testing)
-    virtualisation.docker.enable = true;
-
-    # Helper script: pr-test-vm
-    # Usage:
-    #   pr-test-vm build    — build the staging VM derivation
-    #   pr-test-vm start    — boot the VM with a compose PR branch
-    #   pr-test-vm stop     — graceful shutdown
-    #   pr-test-vm destroy  — force stop + delete VM
-    #   pr-test-vm ssh      — SSH into the running VM
-    systemd.tmpfiles.rules = mkAfter [
-      "d ${cfg.dataPath}/scripts 0755 root root -"
-    ];
-
-    environment.systemPackages = [ (pkgs.writeShellScriptBin "pr-test-vm" ''
-      set -euo pipefail
-
-      DATA="${cfg.dataPath}"
-      VM_NAME="${cfg.vmName}"
-      VM_IMAGE="''${DATA}/''${VM_NAME}.qcow2"
-      VM_PORT=2223
-
-      build_vm() {
-        echo "==> Building NixOS staging VM for compose testing..."
-        # Build the VM config inline — a minimal NixOS with Docker + SSH
-        cat > /tmp/staging-vm-config.nix << 'NIXEOF'
-          { config, pkgs, lib, ... }: {
-            boot.loader.grub.devices = [ "/dev/vda" ];
-            boot.loader.timeout = 0;
-
-            # Minimal kernel
-            boot.kernelParams = [ "console=ttyS0" ];
-            boot.initrd.kernelModules = [ "virtio_blk" "virtio_net" "virtio_pci" ];
-
-            # SSH access
-            services.openssh = {
-              enable = true;
-              settings.PasswordAuthentication = false;
-              settings.PermitRootLogin = "prohibit-password";
-            };
-
-            # Docker for compose testing
-            virtualisation.docker.enable = true;
-
-            # Network (DHCP via virbr0)
-            networking.useDHCP = true;
-            networking.firewall.enable = false;
-
-            # Users
-            users.users.root.openssh.authorizedKeys.keys = [
-              "$(cat /root/.ssh/authorized_keys 2>/dev/null || echo 'ssh-ed25519 AAAAC3... placeholder')"
-            ];
-            users.users.testrunner = {
-              isNormalUser = true;
-              extraGroups = [ "docker" ];
-              openssh.authorizedKeys.keys = [
-                "$(cat /root/.ssh/authorized_keys 2>/dev/null || echo 'ssh-ed25519 AAAAC3... placeholder')"
-              ];
-            };
-
-            # Git + compose tools
-            environment.systemPackages = with pkgs; [ git docker-compose curl ];
-
-            system.stateVersion = "24.11";
-          }
-        NIXEOF
-
-        nixos-rebuild build-vm -I nixpkgs=channel:nixos-unstable \
-          --arg configuration 'import /tmp/staging-vm-config.nix' \
-          --out-link "''${DATA}/vm-result"
-        echo "==> VM built. Run 'pr-test-vm start' to boot."
-      }
-
-      start_vm() {
-        if [ -f "''${VM_IMAGE}" ]; then
-          echo "==> Booting existing VM..."
-        else
-          echo "==> Creating VM image..."
-          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "''${VM_IMAGE}" 20G
-        fi
-
-        # Check if already running
-        if ${pkgs.libvirt}/bin/virsh list --name 2>/dev/null | grep -q "''${VM_NAME}"; then
-          echo "==> VM already running."
-          exit 0
-        fi
-
-        ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
-          -name "''${VM_NAME}" \
-          -machine q35,accel=kvm \
-          -cpu host \
-          -smp ${toString cfg.vcpus} \
-          -m ${cfg.memory} \
-          -drive file="''${VM_IMAGE}",if=virtio,format=qcow2 \
-          -netdev user,id=net0,hostfwd=tcp::''${VM_PORT}-:22 \
-          -device virtio-net-pci,netdev=net0 \
-          -nographic \
-          -serial mon:stdio \
-          -pidfile "''${DATA}/''${VM_NAME}.pid" \
-          -daemonize
-
-        echo "==> VM booting... SSH on port ''${VM_PORT}"
-        echo "==> Wait for it: ssh -p ''${VM_PORT} testrunner@localhost"
-      }
-
-      stop_vm() {
-        PIDFILE="''${DATA}/''${VM_NAME}.pid"
-        if [ -f "''${PIDFILE}" ]; then
-          PID=$(cat "''${PIDFILE}")
-          kill "''${PID}" 2>/dev/null || true
-          rm -f "''${PIDFILE}"
-          echo "==> VM stopped."
-        else
-          ${pkgs.libvirt}/bin/virsh destroy "''${VM_NAME}" 2>/dev/null || true
-          echo "==> VM destroyed."
-        fi
-      }
-
-      ssh_vm() {
-        exec ssh -p "''${VM_PORT}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "testrunner@localhost" "$@"
-      }
-
-      # Main dispatch
-      case "''${1:-help}" in
-        build)   build_vm ;;
-        start)   start_vm ;;
-        stop)    stop_vm ;;
-        destroy) stop_vm; rm -f "''${VM_IMAGE}"; echo "==> VM deleted." ;;
-        ssh)     shift; ssh_vm "$@" ;;
-        *)
-          echo "Usage: pr-test-vm {build|start|stop|destroy|ssh}"
-          echo ""
-          echo "  build    — build the NixOS VM derivation"
-          echo "  start    — boot the VM (create image if needed)"
-          echo "  stop     — graceful VM shutdown"
-          echo "  destroy  — stop + delete VM image"
-          echo "  ssh      — SSH into the running VM"
-          ;;
-      esac
-    '') ];
-  };
-}
--- a/modules/nixos/services/wireguard-client.nix
+++ b/modules/nixos/services/wireguard-client.nix
@@ -1,54 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.gortium.wireguard-client;
-in
-{
-  ##### Options #####
-  options.gortium.wireguard-client = {
-    enable = mkEnableOption "WireGuard VPN client to lazyworkhorse VPN server";
-
-    vpnIp = mkOption {
-      type = types.str;
-      description = "Assigned VPN IP with CIDR, e.g. \"10.8.0.4/24\"";
-      example = "10.8.0.4/24";
-    };
-
-    privateKeyFile = mkOption {
-      type = types.path;
-      description = "Path to the WireGuard private key (age-encrypted, via agenix)";
-    };
-
-    presharedKeyFile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = "Path to the WireGuard preshared key (optional, age-encrypted)";
-    };
-  };
-
-  ##### Config #####
-  config = mkIf cfg.enable {
-    networking.wireguard.interfaces = {
-      wg0 = {
-        ips = [ cfg.vpnIp ];
-        privateKeyFile = cfg.privateKeyFile;
-
-        peers = [
-          {
-            # Server public key (lazyworkhorse wg-easy)
-            publicKey = "rY9zII3AOm8rog2rv02PyA3Bq7zdvTOGkZapfCV1DkE=";
-            presharedKeyFile = cfg.presharedKeyFile;
-            # Split-tunnel: only route the VPN subnet
-            allowedIPs = [ "10.8.0.0/24" ];
-            endpoint = "vpn.lazyworkhorse.net:51820";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
-
-    environment.systemPackages = with pkgs; [ wireguard-tools ];
-  };
-}
--- a/overlays/nixmate.nix
+++ b/overlays/nixmate.nix
@@ -0,0 +1,6 @@
+# ./overlays/nixmate.nix
+inputs: # We pass inputs here so the overlay can see the nixmate flake
+
+final: prev: {
+  nixmate = inputs.nixmate.packages.${prev.system}.default;
+}
--- a/patches/0008-panel-cwu50-fix-init-seq1.patch
+++ b/patches/0008-panel-cwu50-fix-init-seq1.patch
@@ -1,19 +0,0 @@
--- a/drivers/gpu/drm/panel/panel-cwu50.c
-+++ b/drivers/gpu/drm/panel/panel-cwu50.c
-@@ -58,5 +58,8 @@
- 	dcs_write_seq(0x72,0x06);
- 	dcs_write_seq(0x75,0x03);
-+	/* DSI_INIT0: set 4 lanes (bits[1:0]=11) */
-+	dcs_write_seq(0x80,0x03);
- 	dcs_write_seq(0xE0,0x01);
-+
- 	dcs_write_seq(0x00,0x00);
- 	dcs_write_seq(0x01,0x47);//VCOM0x47
-@@ -721,6 +723,6 @@
- 	dsi->lanes = 4;
- 	dsi->format = MIPI_DSI_FMT_RGB888;
-	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
- 
- 	ctx->id_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_IN);
- 	if (IS_ERR(ctx->id_gpio)) {
--- a/1
+++ b/1
@@ -1 +0,0 @@
-/nix/store/7y7rfksqcf5smz59jjixyl56bxq50j9g-nixos-system-uConsole-25.11.20260608.e820eb4
--- a/secrets/ai.age
+++ b/secrets/ai.age
@@ -0,0 +1,19 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA2QUFR
+RmlnY2pYUFBHZGN3dzNpNVc0UW14V2NaVWZHWDJmcU1iWStsSHpJCnRYQUtEalNt
+SzFYWUF6VWRyYWF5VCtsSGduRU96MHA0WlI0b0lpUGFram8KLT4gM0stZ3JlYXNl
+IC5DPExhJQpCMlZRR0E1NGdsYlhNRXZUTVJqTTNHZUZQVUJoYkhheWd3TktvVEFp
+WnFqbS9xWUxJSmI0U0hqQkdzQU1EVy9BCkhWc3A0Mk45YVBxcnJFWU5qa01LRTVw
+WlNoWm40cjgyb1RXS3hGdlpRSEs5V0x0cHNvcVBOek0KLS0tIFhiOFExNnRSbEgz
+M3FmS1owQUdHSXpiWVhLQ0R6emtuK2hZSkkrSTFtTTAKi2hXxTslGLlneDJlvHUm
+OFsvgsHmiADRaiwDC/iCfWyEFzHyupXKX79B6rjt4Up2yUWHLHy4pyCvJiezAh1J
+uxvtVmUYrqYOUoUHCEMLjjVydh5tt+22yXezV0ecU2ePiAgb0gv9EwH8t+70An6Z
+fgvtZZqJ1hK6dTyTf4oROUjPD8RgfjDnRTTvTM1COMvwgpK+cboYAvJ4BhUsn70V
+B3Gveg7++1U2ECF8YHKZGfSuWn0ajT5RzdgRXTveGAINiW4G98oyXnOVhRHmXo9i
+8T/41afy4xhUbNCRsaAApFjS6y8xrpGtrOcpw0u3y3T/bjYHq8VDi4ttYWIF8hJD
+HPo44+SDj0g9lr/UPQDWXaiZjdD6xdioUqnHnaAdyOPPf5D6C5I7WIQPPIjnJ1yc
+PmQkIV4rtb+e7cWrGbnd9stCBZ2F+HcORfjgnJzKI5asy9rmdWPIIHkcZoPFZ/K8
+2ZWXUVgAZvwzcFxSjh5uXKvkOgYixdVLRfa88+KM++vwz0y3O5naq3d1SaLxV4dk
+mRifLNhF9y2MKjX0bZ86Wm74NlhGGQSnUuUHpPLSA6McVOfleN/yJ9gMsosxUc9U
+xIsKHYn8gN0lPVtyTSBTomK6kxoKJXxia50x/XAhJwI9X3ydLg==
+-----END AGE ENCRYPTED FILE-----
--- a/secrets/cloudstorage.age
+++ b/secrets/cloudstorage.age
@@ -0,0 +1,10 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBaT3h1
+K28zWlE3N3BMdHRFaldkZ0F2YVZjT3kxK2dpV1RxZUVOSElsbkdJCnF2M1ZkUWky
+cGtPaXdzMmU1cllsWWtQK3R4Z0xhUExxSW9xUVh3eUo5RjQKLT4geHEtZ3JlYXNl
+IEQ5JWBWM0QKS1N5WlpnbEtLTFNxQVFvbkVEa1BOTDhQRDV0SDhsdWFEdE5xMDRa
+b3loMDZEeGZTZ1NzaFM5UlZYT0NjMHVvWAordjh4cFhnb2pOc3JPZlFLbFU0eC9O
+WWFFVlUKLS0tIEJnMm9LM09KQ3VXNXpNNU1kS3V5VDNOTGozdDdGdWQxcFc3Mk5j
+R0p0WVkKIX6p7MGDZOxS5qVgYs5K5sKC31IPIEMaWAqA5Gygegj5rVnKtN/jn7+9
+L5CBbzaSXzNwRce0WPVi0mQp56lL12mRlXXamOx/E9Q+r2rznFYdQA==
+-----END AGE ENCRYPTED FILE-----
--- a/secrets/containers.env.age
+++ b/secrets/containers.env.age
@@ -1,36 +1,43 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBWNEpt
-cGFNeVBBaDRqb3pLSEZGQW0wb3VmVnBoZCswUFkzbnBLUnJ0QTNrClRqVkk4RUVO
-d29KYjd5YUcwankvaTFmVHUxQVpDT2ZYWHRaY3JXTUtQMU0KLT4gKXBtQ3UsXi1n
-cmVhc2UgNnwxYCBXVyA/KCQmIHt9NAo3OTZVUHR2UXkvaEFwY0ZBdEJsaFpsbHJ0
-cklKcDVHcEdWMEdPSkpnN0FiRU43RW5hUWFMdjR3WFRRSFBLSGlmClM3cTNJWlNM
-TExkdHdXUHJISkNIaE1TTUxUc1NUWkV1a09HeFU3bVZwQXMKLS0tIGhOcXFTUElS
-azJJNnEreUhMWTJBaVZGSTJPRUFqQkVYS01KRENUVVpZSDgK8+8onFejroBo7MeO
-dW+so4lOsq4zJKn3f0cxmCFg1f0X8zt6h4Uc3A5Cvr1uU+6yw1FWmJ7xa3jJz3lO
-EEaKQJXYC+xIIKGcA7qILa0SFp4a/4OuYjcg27HrlPhg7u5wDhQrd0LdVEe1Xngp
-ZivX7P7HwIna3X8C+TL+K2v/AG2N/z86cdKfRvxyMKNbHhYw+CfHEnWgh8tJ++4h
-G9evNniuNqte6cQaRe7jODfPNW4FuY/Sb7barlJ/M9iAQdYAdyLAzU1LABeHeUfD
-wtHjxy9DUZ55Vg8bB8M2JJU9MkoRT4ewiVd9LeC1GWeVmKsm93wsmrov714i7U2j
-wHtDkjqEF2MmzuQc18sjNaAHiwz8j6o5xU2L/Q4+Q707yISWG7RGZYh389Cr1rnw
-siUq/Vunqw2wk13+J/4vu9nqt5mMktBaCtp+QiWIurjwB5LUAyChrSm+dg5lb0Mt
-UhSc0lq1+E3vxAXM2Hmk+vP86VD+6WJvAU82VFApF1s6zG2FU1/AcOVVf54nan/q
-f+rgSFfASHQCYSblUJHyEtwLNsWEmTGmOEn1buUKD/H0zatPQnc0rYpjlx2V0Sjd
-6yB5+wPrZ0AkN1pjcsPKOv8Kaog2DzqIjib+SaSTaRxWHQEb9uzvaReAcYI5HOpE
-gkC040HN33BItATbo4+hz70Im8Ni/VXD+g6yzM6Hj1hJL+PinTKeg5keQRFIZjMx
-grzievB2wVBBgLgN3qMdTFmpplaL7iL702JjXZUTTK9Izp+9wiCsV1fTa53FWDht
-ylFL5SWElqXjK+QBXxAe+Jk6VQov5HI21YDXL67S554ABeRok23wxrQ31TCI4xq9
-PQV7VtNRjyVud7S29m3OwpWOsgTZhn+JclHj2v4bNJzJkJnZRTmcvGPktzRI5+R4
-e5vxVhGnJDzI71txaHl8+xS1lu9VzCQUrxX6TXyTRV4KjIOz0g06JOBgmBRBvJca
-7MZbC65xpisl/gyLRbgkVga3t94dPV+dpZsn8eq6427IyRbKslJefatggR9//c6I
-5N5fl0fR3gJQMB+HRbipBH2YsdbdWJyb4Nn6STZxIfrqoG/xC6C1raF0xK7hUx6i
-4DUDSPohM8fOIswQPfE+FH3eygfzu/Ln5+ghsgHTEhgFvmgMvyxaAt6kHIzIUhMX
-M3dASr4VPDpIXuXsRWwYLEifhzxsuvwVxfwtsnCaR6XKijsYECWGDdYOWHdleeqx
-wDPhxEesfFVhKxhrKY9Ir8k9/FFBKQU/3GjW4+SMAg5Al1YEzxshP9vKuVcsei7W
-JDwAwotNXaCm6NBckiyZJE53ou6+gckPY7V9cOfnuH74Z9ywkFzB3HW3ZlonaGyM
-oGmLGcccavFtyhg5s/As4i6X8ARIpDiwe59Pn3GNXMctySqIrrr2ogUoXgrfFCie
-6GOTdeMW7GeOSdJUxCofghlspS/nq01Og77VI/beWYrIwLubSka6Zaltww9zgObk
-/FGEMgFkEpq7iyCvYSPA8F46pJKvnMP3S84AWCPmcTcHeg4lwGPvs6btexXBGdoz
-nkCyq7wdH5Nngm7jUbl88LtaLZPAQkuqXphBVTnrF9Ofbnb4iRZ2Op4xpx9rGyvx
-mO6UEhL6V1i2YZFNkNMg/W8aoMiUgBdqbkxaxblT9L0aNdlFU9+LbWYolURVEadd
-Qjv0Z1gMA+tsuBbVszwsMfneZ5+B9Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBVYWFV
+U1dWcVVoZVJ2a1Bmd00zbnRvYnNTb0RvUlhJSVZheVlZcGlKRFgwCmVNTVNzVk8z
+ZSszVUN2enhIV09UMkpGNG9vZlhTTVZrd1U1QnB6OVpnOU0KLT4gSCgtZ3JlYXNl
+IFtVXTlQIGl6YXRHCjdqNS9oa3p5dGZseWV5NDNadjN2VDVheCtkRm1jRWpuY0Y3
+Sk1aWHhyQQotLS0gaFo5TjM1bFdKOEJVenZHK3RXOHExeXV0dFIrTUNMc0pnTXBM
+YWIrNHdHNAqkUzENsQawFRPRh6K13pJN9pkDGpvpx07kTPkUWbocUQoJMxeXdAlh
+Syw6Ca2X2Xb2QGnO6EIoMsfs6Tg78cEiDH4DEcdcNdHoSZlaNGLrUHnvE/Ygc/G0
+vz0D3uxTTvRBFYPNSONt+uN9j2p3JEZK5Hllt1GRmo6c8xnktDQpkwYLgegPYYxW
+5Ge/ywwPlKp1WzqVVBQv2FH1/qm0QcBUhtjrkTTPFOjk3vlrXqbSM7n4cMZJYWRi
+kMK51q2H49anwT8gkaeJ7hwlJpmzNIocDpD5sxxXj1NGc+uogEfaZrP7IRsACSTa
+ggub/LYjPyajj4CLjt+6O3KNepNsOTEiGH11TZ6cyjipDerIcZx1rO/6cnOPpN40
+TZQc1IW+oGrbJk7WNNX4gjX2t0+ElVeDVQ2wEe862Yh4OxyMVUkCyh9DGFu5RxL4
+veKJfvs6VSjS4GtaOOXAxYra5GXGaNAx9w53MRSWXd7T9eh4VnYr0pvdRPMYyQAe
+H/aNl9lqtQt1r4DtfF/RMOuqIiKFlnnhKlVfp5uCAn5Bgn4nCBMvQrAlghXWzI+N
+rou2kBuzI3yKDO+8VJlacEVXM9vwv/O15XYpY/Mn1TYzbsOQi7FgnFatAWr6Uinh
+gmay4WDxikIlKdhV1CqOJek5AAC1ptVCDgDcOpERDdZ+whBHUDTJ4NjMEPPcmlyw
+9sejEf7mjuqKY5VGAVy2CRqV0wIMJ3nIo8Um2NNQE2BKCVyucmxhPVA6NieRgG8F
+NvqIE3Iji1xFiUC+twjOkTcVAl7hKk2yLjZxF6KqoP7rWr787qr3qNA3cXhxgSUN
+ZX9kzepy7pTyHADqK4j1Hum8o6/OjKaGQy/HIiywMjfk7zl3+Cs0PhjKG9HBReIQ
+MqbJqa2fyAqOuHk/44Lpja1CI7LGWxOrctTixG3+Gy3JmTrZh8pDqzzNmPrByrHO
+nN3HzUZ/4sw5ONUz/GQ89WcSjez1TNr+lwRsYMf8tUCRHgdxUT9HRXUeOd8eD4d
+CDyoAYpab01ZFkHzRhBOWJlqjqhDNIDEzMjImU4ieBsgCh9ZyIZF2HetLov6xESo
+FYCDb7UqIXsw7n04wSTbwcYV2iPQ0EowPrADcSvqq+9YVr8Tsw6pmTaxC18Wi+zY
+7R9ALANy9qgxLnBAAXIbp2iyJayFQDNONkOlp4NV2RiVN/UrHcZNsZsSfM0DFzqh
+spuqt3czmAdvUzWpnghjMRUC49kkW2XNJxS9dREHmEPVZnzQo457CCCFsAqmrRB6
+c/wvyKD86Z89l/tkrLVz+sLQJMYfc5zED+EjyZyghHprkqZ6iDjFaEQUO8Fk2FwX
+wCDqJhJGXs3MT7tJnfIrwy4AvJv9FgUnMYYpQiyv+ToDqgAWGVDfxGieQo6r59El
+ZpTx+qt3jT+jI5Z6v4OVRODU2FFlee+YcF3ooF3yiwNdvuRhIgOVCNXkD/9QBOyq
+MiOcCcGNxWx3COGIdshg/HVjGfxm+zZUYW0ktn3/YNkUHPIPxIWPNRdlQ9xbu3kD
+vd1Ivx8wsUfo7soMffjdYKoAbAWS/3Ce/Sgpk15uo7CzGoO7Egzj+cb4GtvgojDD
+BwG3CSzUJcXV2zbRwxfHRanko0RN/Qpskc/P1DiSMduxP8nZT+/r2HCykX+CRkM7
+PtnG0moKD3i5u3X/jQAAPA1X9BPbbwgTE/nmHpgMxG1BD5GlLmeY1hkBRwEUlnSr
+UsN8FaWGBKyPMtMhK8EcjzmH259NJYguDgpBgMiIpO3sXst4yK5RuxR22+S8AI6X
+VucMZWa+BzyHc3Oej/T5UrCIZ/tDzktD0Xp76EZxPD7ADw2z0+7TQ5YSYFal3+X1
+fcdKTphts2YRvtXLQuv+8SCIcf8VKMVjIkRCtE5ez1Isk+ZHEtprKsp9ZFsj9cFV
+R6c2d1YqoW7IGWfcZL4snG09DaifPtwiwJBdYxRfGXgOq1fxtszzAxdlIoT3HRVo
+pBHZp+7zcAXFyjgPDGOP5fcfGbMD41Vr9W9DVzioBIZDDQLRs4M6DZDgqgWv32tO
+P7s2TivIEoAnirtic+tQZe5lXwndPUou0qYTO28diLSCTj29S+Vw9/ftah7qOqy6
+iDdf2rhbMNSRoywZOwQer6aLHePkSq7yDRRnQburIaUyy4FWjSYumx3O/2++JrkW
+uFhLRIOu4M3gkgyqb4xOscxl/aEGZADR8tLIeqn/Bnt/Bub8vTph1H/ZCYEvjZA5
+afmShsiIKw==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/gortium_password.age
+++ b/secrets/gortium_password.age
@@ -1,10 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA4MlFz
-SHFjYjJMVHRlTWNGVGI2bHQxc0xRd2tlaExlM0NFMWhlbkR2bVg0CkxxenVTaXkr
-eWxybDdCeUM0ejRvZWI4cFZCWm5VczRvZkNnT0d5Y1oyYmsKLT4gK1NmRzVtLWdy
-ZWFzZSB3UDI6TyNaCnF4Ylk0QWduaXZxRFBFbDBOZ0dxeGxiWTVCYjRtZTJBRkFC
-YU5qaytYWWI4OWl1K1FSdXNlY2JXZjkzak9tTHkKVFlCRlRqY1FVSzFmNS9yZmxF
-aEUxelUwNEpKN3VXYi9KUWN4bXFscm5oUEFOajhRZDlERWVYcFgvQQotLS0gK1JI
-VERTQjB6d1k3NDQwbjNveXBqcFk1WE96cHlaTTVkTWRMZENPamFJZwpcT1CP/KvU
-CsunvfX9RBlSSKuw4eem9N9s3JqJNj4FRQizNx6QzlE1vSME
-----END AGE ENCRYPTED FILE-----
--- a/secrets/home_wifi.age
+++ b/secrets/home_wifi.age
@@ -1,10 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
-YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
-V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
-Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
-aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
-cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
-TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
-KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
-----END AGE ENCRYPTED FILE-----
--- a/secrets/homeautomation.age
+++ b/secrets/homeautomation.age
@@ -0,0 +1,19 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBOSk9J
+RDF0bk4zNmdWRXhFTU1xUlVKeDJkTU51UDRiNjcvWlVKT3cxNzBvCk00ZEtMdlI2
+L2xiS3BnT1g0aEd3VmgydCtSVERrTjNraHNmSHZicENLODAKLT4gI0crX0A0Zmst
+Z3JlYXNlIE8wNCBfPz5uSy4KSGxzcnJlM1FRamI0VWlZbTJvRnRuanlwSjN0eisy
+bnlHSDZZbHpIbGNZUngvS1Fqb2dzd1p6UjZKZGowOUhONgoKLS0tIE1NMUV3QlpV
+dEFXMUVOTFBGSlpVSjFzRlpjVTk2dkx1VURUaFl3R014a2cKTnWIRQg4txvZZ4A5
+XdwnXZqmYzOX7l2UrjmP/TJA++EURZzYtTS+q3FV9QTIj+7k0DOLf9nKq7XHlGM8
+Ptkaf/s1Ly7ke+v9l9C2uf9oNI6b+m3d7QqZC5WWvRXWvl9ImaJ3xVi9AM5f5NWH
+Likn6GZDir4ihAec8pAi3H2SCCjkhqF/TlLe99tp+7AAUiOjNuNlej1OUOmJNxEr
+GnHePwZZqa6/F9YnYQ0tKKRsZH5whxUPYUwhHSuWa/NidBK7lqKqdaPBevfdqWLg
+59gkaL9BeGG5FUXg1cPEWAvOQ5Ajae/kVH6aRi5LXJPZfA/DetWgm9mmxJ2qPpFD
+/n/JCsQUOnpk66j38bWMW5uok51s61oG1OZWGpPYstoLtivKOlVpG7xgioGqIIuc
+c2ZsKK/iCauwX3sGQtpX9DbILrtOnzxU2B/dclcXe2EDfSJH0u2RrefxcqPG87pI
+BAosRdq7GUUISSCTccaswwG555a7/Z5gzXOwXeQYNlK1HRnkF9oBsKTUoAI2b+VO
+Hdv1uw9u5JLcZt+5qSB6AxJuk8yDF0KXIqkaCiwl2fV3bBkehPru7oCJFTtVMFVZ
+u0A0h+n8KJCvyRKe/Tl+lT+JHM6Mk7SkFrmsaepZPnAtfLht+bP6b0oHrUsVx/iI
+r7o=
+-----END AGE ENCRYPTED FILE-----
--- a/secrets/network.age
+++ b/secrets/network.age
@@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBVMEhO
+RWdybFg4VWJaMjRWYm1ac2pzZ3R5aFZEM1o4dUtFZ0M4QnVKRzIwCnNGRFRjb01X
+QU5mQTRSb21MV3lMMERIMGI1RHFQVFFZNlVlMnk4aTdna1kKLT4gM24xLWdyZWFz
+ZSA/bVhubQplcXNVN3kxOEpqY2hUbkV3MG5PNVJtRGhORVVLdFVCRnFFVjRneEFI
+VWFyZTRNS280RXlnckJpdFR4V1NBSTUzCjlxZkZ3UllpZXUwczR0T3JGRzUzMEhV
+U1hobC84eWtEWWZOYyt6M2c3OUZIUTlKTm41dVp5UEZVSmVwWHBmR00KCi0tLSBF
+ZnJ5QzN2VXpsY3JQQ3lmbklxcldydm1MSlFlejJ2S3hVVUtka0hTM044CvqhtnFn
+pZsgP6w5uKh9CtVQpcyST8hA9P24e1opfu1JN3m/8g9XiJrMT5qVYtUXkV+pr4s6
+pVGsp9KScaS0T8TpLxvZoUAAdvVtdHh6GSbbszR6gZbStbWXmb6THYKHOghpK9HD
+cDEoRmzcmFdwi3m26Xppmi2R6NmeKI4S6pbY95bfh2E6jn+7
+-----END AGE ENCRYPTED FILE-----
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -8,9 +8,11 @@ let
 in
 {
  "containers.env.age".publicKeys = authorizedKeys;
-  "gortium_password.age".publicKeys = authorizedKeys;
-  "home_wifi.age".publicKeys = authorizedKeys;
  "lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
  "n8n_ssh_key.age".publicKeys = authorizedKeys;
  "openclaw_gateway_token.age".publicKeys = authorizedKeys;
+  "ai.age".publicKeys = authorizedKeys;
+  "cloudstorege.age".publicKeys = authorizedKeys;
+  "homeautomation.age".age".publicKeys = authorizedKeys;
+  "network.age".age".publicKeys = authorizedKeys;
 }
--- a/secrets/tak.age
+++ b/secrets/tak.age
@@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBsYXVu
+Sk5CSjNsbHBRZkNXUGZVeGNva3FKMUdHV0RiQzJLNHVvSHZzd0dRClNnbzZvUFFR
+Ty96OXZ4R2lCMHpnclpVaEZ1TEYvb0tTSVRwdWV1amdIL0UKLT4gYTtvOmAtZ3Jl
+YXNlICk5WkE7USUgSyRLCjBmTWRTdEJJV2lNbVRlL3VidmZza1NTTWhIcG1vVFY5
+OUUxcG4ycTMraUUKLS0tIEVlaUdlcUFPMkZSMUpJVEFzTksrVC9lZGlMNEJ1SFBv
+SFNtc0wwQ05nQ0EKYlRGYGeKlfW0lTPdpCtcTfh2NWUuyZnDFe6VAWLYL3PW42od
+a+bhlgxTi9KF5FLjVA3IIdQSsKiMya+PI0VfOLWkA24ZN+4uilsQkicxnnRR1z8o
+hv9G8N3eYqBsLylg8rW2Xkn4RzT/S5TyJZPFG4HsUYWtHS+iomg4HbQrgIrpIde9
+Th3V8WQB1HfKs9ilg8Q/DvDckFjevWYz2OXMYx4ZHWS53huQfE/oWPZfQid6Dd06
+NXcvCHPVDUszhWvcoOsSpK6vaOnuY1B32/qExw==
+-----END AGE ENCRYPTED FILE-----
--- a/users/ai-worker/ai-worker.nix
+++ b/users/ai-worker/ai-worker.nix
@@ -22,6 +22,7 @@
  #   - 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
  security.sudo.extraRules = [
--- a/users/gortium/gortium.nix
+++ b/users/gortium/gortium.nix
@@ -1,6 +1,4 @@
 { pkgs, inputs, config, keys, ... }: {
-  home-manager.extraSpecialArgs = { inherit (config.networking) hostName; dotfiles = inputs.dotfiles.outPath # flake input (not submodule); };
-  home-manager.users.gortium = import ./home.nix;
  users.users.gortium = {
    isNormalUser = true;
    extraGroups = [ "wheel" "docker" "video" "render"];
@@ -8,10 +6,9 @@
    packages = with pkgs; [
      tree
      btop
+      nh
    ];
    shell = pkgs.zsh;
-    passwordFile = config.age.secrets.gortium_password.path;
-    ignoreShellProgramCheck = true;
    openssh.authorizedKeys.keys = [
      keys.users.gortium.main
    ];
--- a/users/gortium/home.nix
+++ b/users/gortium/home.nix
@@ -1,64 +0,0 @@
-{ pkgs, lib, config, inputs, hostName, ... }:
-
-let
-  isUconsole = hostName == "uConsole";
-in {
-  home.username = "gortium";
-  home.homeDirectory = "/home/gortium";
-  home.stateVersion = "23.11";
-  programs.home-manager.enable = true;
-
-  home.file = {
-    # tmux
-    ".tmux.conf".source = "${dotfiles}/tmux/.tmux.conf";
-
-    # kitty
-    ".config/kitty/kitty.conf".source = "${dotfiles}/kitty/.config/kitty/kitty.conf";
-
-    # nvim
-    ".config/nvim/init.lua".source = "${dotfiles}/nvim/.config/nvim/init.lua";
-
-    # starship
-    ".config/starship.toml".source = "${dotfiles}/starship/.config/starship.toml";
-
-    # btop
-    ".config/btop/btop.conf".source = "${dotfiles}/btop/.config/btop/btop.conf";
-
-    # waybar
-    ".config/waybar/style.css".source = "${dotfiles}/waybar/.config/waybar/style.css";
-    ".config/waybar/config.jsonc".source = "${dotfiles}/waybar/.config/waybar/config.jsonc";
-
-    # wofi
-    ".config/wofi/style.css".source = "${dotfiles}/wofi/.config/wofi/style.css";
-    ".config/wofi/config".source = "${dotfiles}/wofi/.config/wofi/config";
-
-    # yazi
-    ".config/yazi/yazi.toml".source = "${dotfiles}/yazi/.config/yazi/yazi.toml";
-
-    # hyprland — common config
-    ".config/hypr/hyprland.conf".source = "${dotfiles}/hypr/.config/hypr/hyprland.conf";
-    ".config/hypr/hypridle.conf".source = "${dotfiles}/hypr/.config/hypr/hypridle.conf";
-    ".config/hypr/hyprlock.conf".source = "${dotfiles}/hypr/.config/hypr/hyprlock.conf";
-    ".config/hypr/hyprpaper.conf".source = "${dotfiles}/hypr/.config/hypr/hyprpaper.conf";
-    ".config/hypr/mocha.conf".source = "${dotfiles}/hypr/.config/hypr/mocha.conf";
-
-    # hyprland — host-specific monitor config
-    ".config/hypr/host/monitors.conf".source =
-      if isUconsole
-      then "${dotfiles}/hypr/.config/hypr/hosts/uconsole.conf"
-      else "${dotfiles}/hypr/.config/hypr/hosts/laptop.conf";
-  };
-
-  home.packages = with pkgs; [
-    git zsh tmux starship
-    neovim kitty
-    btop yazi ripgrep fd fzf
-  ] ++ lib.optionals (!isUconsole) [
-    waybar wofi swww hyprshot
-  ] ++ lib.optionals isUconsole [
-    brightnessctl
-  ];
-
-  programs.zsh.enable = true;
-  programs.starship.enable = true;
-}
Author	SHA1	Message	Date
Robert	add14ab914	Merge branch 'fix/hermes-submodule-update' of ssh://code.lazyworkhorse.net:2222/gortium/infra into fix/hermes-submodule-update	2026-07-07 20:53:28 -04:00
Hermes	256fa2fde9	chore: update compose submodule (openconcho ReactNode fix)	2026-07-07 20:52:41 -04:00
Hermes	d8919970b6	chore: update compose submodule (openconcho TS fix)	2026-07-07 20:50:05 -04:00
Robert	2deebc102b	Merge branch 'fix/hermes-submodule-update' of ssh://code.lazyworkhorse.net:2222/gortium/infra into fix/hermes-submodule-update	2026-07-07 20:47:16 -04:00
Hermes	898bd2097c	chore: update compose submodule - openconcho to upstream v0.16.0	2026-07-07 20:43:09 -04:00
Robert	d72b799027	Merge branch 'fix/hermes-submodule-update' of ssh://code.lazyworkhorse.net:2222/gortium/infra into fix/hermes-submodule-update	2026-07-07 20:15:36 -04:00
Hermes	c1414603cd	fix: update compose submodule to fix openconcho SHA (force-pushed commit)	2026-07-07 20:10:36 -04:00
Hermes	c8abad243e	fix(compose): update submodule to fix/hermes-gosu-honcho-ssh	2026-07-07 19:49:47 -04:00
Thierry Pouplier	60a90d5f98	Merge pull request 'fix: update compose submodule pin to include USER hermes fix' (#77 ) from local_changes into master Reviewed-on: #77	2026-07-07 19:41:59 +00:00
Hermes	2338eaf74c	fix: update compose submodule to include USER hermes fix The compose submodule now points to commit 54e0661 which adds the missing USER hermes at the end of the Hermes Dockerfile. This ensures all container processes run as uid 10000 instead of root, fixing the privilege leak where background subprocesses escaped the gosu drop and created root-owned files in ExoKortex that broke Syncthing sync.	2026-07-07 14:59:26 -04:00
Robert	df91a909b6	More local changes, mostly compose update and nixmate	2026-07-07 14:15:26 -04:00
Robert	2e236581f0	update lock	2026-06-15 13:20:15 -04:00
Robert	65587809aa	Added opencode api key	2026-06-15 13:17:49 -04:00
Robert	2b1df578ac	Deleted wrongly created file...	2026-06-15 13:16:58 -04:00
Robert	1c806e6390	Updated the compose pin	2026-06-15 13:15:12 -04:00
Robert	78ab440727	Split container secret in preparation to switching seperated env	2026-06-15 13:12:39 -04:00
Robert	ab7da92626	Added tmux, removed opencode, openclaw node	2026-06-11 15:27:08 -04:00
Robert	e3f7d18d8e	Added paperclip and honcho secrets	2026-06-11 15:02:16 -04:00
Thierry Pouplier	5aca97e057	Merge pull request 'feat: add uConsole CM5 host with Reticulum mesh network support' (#61 ) from feat/uconsole-cm5-v3 into master Reviewed-on: #61	2026-06-06 13:19:19 +00:00
Hermes	a51e095717	feat: enable aarch64 cross-build on lazyworkhorse (QEMU binfmt + extra-platforms)	2026-06-06 09:16:23 -04:00
Hermes	9ebbb1c0c6	fix: bump nixos-raspberrypi to v1.20260517.0 (matches nixos-uconsole tested version)	2026-06-05 23:38:21 -04:00
Hermes	7f11da1878	fix: let nixos-raspberrypi manage kernel version (patches incompatible with linuxPackages_latest)	2026-06-05 23:33:10 -04:00
Hermes	29cc20bb04	fix: add wants=network-online.target to rnsd and kismet services to silence eval warnings	2026-06-05 22:58:09 -04:00
Hermes	1617ac9149	fix: migrate from deprecated kernelboot to kernel bootloader for nixos-raspberrypi	2026-06-05 22:57:26 -04:00
Hermes	24f15c98cd	fix: add format=setuptools to all reticulum overlay python packages	2026-06-05 22:46:54 -04:00
Hermes	bdd6d03739	fix: use mkForce for PermitRootLogin to override upstream module default	2026-06-05 22:45:59 -04:00
Hermes	a0a6663793	fix: use mkForce for PasswordAuthentication to override upstream module default	2026-06-05 22:45:30 -04:00
Hermes	b66ffadb79	fix: add missing 'keys' to uConsole module args	2026-06-05 22:43:53 -04:00
Hermes	db2bd1d157	feat: add uConsole CM5 host configuration with Reticulum mesh stack - New NixOS host 'uConsole' for ClockworkPi CM5 portable terminal - flake.nix: add nixos-uconsole and nixos-raspberrypi inputs - Imports: nixos-uconsole.nixosModules.uconsole-cm5, nixos-raspberrypi.nixosModules.raspberry-pi-5.base - Full package list: base tools, HAM radio, SDR/RF, mesh/LoRa, security tools, GPS/maps - Reticulum stack (rns 1.2.9, lxmf 0.9.8, nomadnet 1.1.1) built from PyPI via overlays/reticulum.nix - systemd services: rnsd (Reticulum daemon), kismet (Wi-Fi IDS) - Kernel modules for SDR (rtl-sdr, dvb) and USB WiFi - Follows existing host config conventions (cyt-pi as template)	2026-05-20 14:34:15 -04:00
				`@@ -1 +0,0 @@`
				`/nix/store/7y7rfksqcf5smz59jjixyl56bxq50j9g-nixos-system-uConsole-25.11.20260608.e820eb4`