hastily move configs around

configuration.nix

@@ -1,24 +1,5 @@
-{ config, pkgs, lib, ... }:
-
-let
-  uboot = pkgs.uBootPinebookPro;
-in
 {
   imports = [
-    <nixpkgs/nixos/modules/profiles/base.nix>
-    <nixpkgs/nixos/modules/profiles/minimal.nix>
-    <nixpkgs/nixos/modules/profiles/installation-device.nix>
-    ./nixos/sd-image-aarch64.nix
     ./pinebook_pro.nix
   ];
-
-  sdImage = {
-    manipulateImageCommands = ''
-      (PS4=" $ "; set -x
-      dd if=${uboot}/idbloader.img of=$img bs=512 seek=64 conv=notrunc
-      dd if=${uboot}/u-boot.itb of=$img bs=512 seek=16384 conv=notrunc
-      )
-    '';
-    compressImage = lib.mkForce false;
-  };
 }

nixos/sd-image.nix

@@ -7,7 +7,7 @@ let
     inherit (config.sdImage) storePaths;
     #compressImage = false;
     populateImageCommands = config.sdImage.populateRootCommands;
-    volumeLabel = "NIXOS_SD";
+    volumeLabel = "NIXOS_RECOVERY";
   } // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
     uuid = config.sdImage.rootPartitionUUID;
   });
@@ -87,7 +87,7 @@ in
   config = {
     fileSystems = {
       "/" = {
-        device = "/dev/disk/by-label/NIXOS_SD";
+        device = "/dev/disk/by-label/NIXOS_RECOVERY";
         fsType = "ext4";
       };
     };

sd-image.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+
+let
+  uboot = pkgs.uBootPinebookProExternalFirst;
+in
+{
+  imports = [
+    <nixpkgs/nixos/modules/profiles/base.nix>
+    <nixpkgs/nixos/modules/profiles/minimal.nix>
+    <nixpkgs/nixos/modules/profiles/installation-device.nix>
+    ./nixos/sd-image-aarch64.nix
+
+    ./pinebook_pro.nix
+  ];
+
+  sdImage = {
+    manipulateImageCommands = ''
+      (PS4=" $ "; set -x
+      dd if=${uboot}/idbloader.img of=$img bs=512 seek=64 conv=notrunc
+      dd if=${uboot}/u-boot.itb of=$img bs=512 seek=16384 conv=notrunc
+      )
+    '';
+    compressImage = lib.mkForce false;
+  };
+}

system.nix

@@ -1,7 +1,12 @@
 import <nixpkgs/nixos> {
-  configuration =
-    if builtins.currentSystem == "aarch64-linux"
-    then builtins.toPath (./. + "/configuration.nix")
-    else builtins.toPath (./. + "/with-cross.nix")
-  ;
+  configuration = {
+    imports = [
+      (
+        if builtins.currentSystem == "aarch64-linux"
+        then builtins.toPath (./. + "/configuration.nix")
+        else builtins.toPath (./. + "/with-cross.nix")
+      )
+      ./sd-image.nix
+    ];
+  };
 }