From 7e3b2520eb28969e24ced5c31ad959ae37d9bede Mon Sep 17 00:00:00 2001
From: Hermes <hermes@lazyworkhorse.net>
Date: Fri, 12 Jun 2026 21:47:29 -0400
Subject: [PATCH] fix: use nixos-raspberrypi.lib.nixosSystem + sd-image module
 directly

---
 flake.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 281936f..47bbd63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,25 +142,31 @@
         packages.${system} = {
           # Image SD flashable pour uConsole CM5 (SSH + WiFi + clés)
           # Usage : dd if=result of=/dev/sda bs=4M status=progress conv=fsync
-          uconsole-cm5-image = nixos-uconsole.lib.mkUConsoleImage {
-            variant = "cm5";
+          uconsole-cm5-image = let
+            rpi-pkgs = nixos-raspberrypi.lib.mkRpiPkgs forSystem "aarch64-linux";
+          in (nixos-raspberrypi.lib.nixosSystem {
+            system = "aarch64-linux";
+            specialArgs = {
+              inherit self keys inputs;
+              nixos-raspberrypi = nixos-raspberrypi;
+              isCM4 = false;
+            };
             modules = [
               {
                 nixpkgs.buildPlatform = system;
                 nixpkgs.hostPlatform = "aarch64-linux";
-                nixpkgs.config.allowUnfree = true;
               }
               nixos-raspberrypi.nixosModules.nixpkgs-rpi
               nixos-raspberrypi.nixosModules.raspberry-pi-5.base
               nixos-raspberrypi.lib.inject-overlays-global
-              # kernel uConsole + notre config minimal
+              nixos-raspberrypi.nixosModules.system.sd-image
               nixos-uconsole.nixosModules.kernel
               (nixos-uconsole.nixosModules.cm { lib = nixpkgs-uconsole.lib; isCM4 = false; })
               nixos-uconsole.nixosModules.base
               agenix.nixosModules.default
               ./hosts/uconsole-cm5/configuration.nix
             ];
-          }.config.system.build.sdImage;
+          }).config.system.build.sdImage;
         };
       };
 }