From d039a262cecc42897c4d8b3014e83cadbd9c46e3 Mon Sep 17 00:00:00 2001
From: Travis Staton <tstaton@mercury.com>
Date: Thu, 3 Oct 2024 18:39:26 -0400
Subject: [PATCH] disable sd-image

---
 flake.nix       | 13 ++++++++-----
 rpi/default.nix |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index ed8be8e..c0acdc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,15 +53,18 @@
         core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
         libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]);
       };
-      nixosModules.raspberry-pi = import ./rpi {
-        inherit pinned;
-        core-overlay = self.overlays.core;
-        libcamera-overlay = self.overlays.libcamera;
+      nixosModules = {
+        raspberry-pi = import ./rpi {
+          inherit pinned;
+          core-overlay = self.overlays.core;
+          libcamera-overlay = self.overlays.libcamera;
+        };
+        sd-image = import ./sd-image;
       };
       nixosConfigurations = {
         rpi-example = srcs.nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
-          modules = [ self.nixosModules.raspberry-pi ./example ];
+          modules = [ self.nixosModules.raspberry-pi self.nixosModules.sd-image ./example ];
         };
       };
       checks.aarch64-linux = self.packages.aarch64-linux;
diff --git a/rpi/default.nix b/rpi/default.nix
index 02b582a..57b93a1 100644
--- a/rpi/default.nix
+++ b/rpi/default.nix
@@ -8,7 +8,7 @@ let
   kernel = pkgs.rpi-kernels."${version}"."${board}";
 in
 {
-  imports = [ ../sd-image ./config.nix ./i2c.nix ];
+  imports = [ ./config.nix ./i2c.nix ];
 
   options = with lib; {
     raspberry-pi-nix = {
@@ -93,7 +93,7 @@ in
             {
               Type = "oneshot";
               MountImages =
-                "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}:${firmware-path}";
+                "/dev/disk/by-label/FIRMWARE:${firmware-path}";
               StateDirectory = "raspberrypi-firmware";
               ExecStart = pkgs.writeShellScript "migrate-rpi-firmware" ''
                 shopt -s nullglob
@@ -308,8 +308,8 @@ in
           # table, so the partition table id is a 1-indexed hex
           # number. So, we drop the hex prefix and stick on a "02" to
           # refer to the root partition.
-          "root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
-          "rootfstype=ext4"
+          # "root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
+          # "rootfstype=ext4"
           "fsck.repair=yes"
           "rootwait"
           "init=/sbin/init"