From 3323b0ff0d669bb8b8c0551946a3ecb5f834e913 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Wed, 27 Jan 2021 21:52:22 -0500
Subject: [PATCH 1/5] installer: move ./cd-dvd/sd-card* -> ./sd-card/

---
 .../installer/{cd-dvd => sd-card}/sd-image-aarch64-new-kernel.nix | 0
 nixos/modules/installer/{cd-dvd => sd-card}/sd-image-aarch64.nix  | 0
 .../{cd-dvd => sd-card}/sd-image-armv7l-multiplatform.nix         | 0
 .../installer/{cd-dvd => sd-card}/sd-image-raspberrypi.nix        | 0
 .../installer/{cd-dvd => sd-card}/sd-image-raspberrypi4.nix       | 0
 nixos/modules/installer/{cd-dvd => sd-card}/sd-image.nix          | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image-aarch64-new-kernel.nix (100%)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image-aarch64.nix (100%)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image-armv7l-multiplatform.nix (100%)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image-raspberrypi.nix (100%)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image-raspberrypi4.nix (100%)
 rename nixos/modules/installer/{cd-dvd => sd-card}/sd-image.nix (100%)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
rename to nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
rename to nixos/modules/installer/sd-card/sd-image-aarch64.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
rename to nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
rename to nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
rename to nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/sd-image.nix
rename to nixos/modules/installer/sd-card/sd-image.nix

From 3c744bf68d0dbfbe18f9b0d5487b843f29ed47c1 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Wed, 27 Jan 2021 22:00:45 -0500
Subject: [PATCH 2/5] installer: split sd-card into installer & base for
 bespoke image

---
 .../installer/sd-card/sd-image-aarch64-installer.nix        | 6 ++++++
 .../sd-card/sd-image-aarch64-new-kernel-installer.nix       | 6 ++++++
 nixos/modules/installer/sd-card/sd-image-aarch64.nix        | 1 -
 .../sd-card/sd-image-armv7l-multiplatform-installer.nix     | 6 ++++++
 .../installer/sd-card/sd-image-armv7l-multiplatform.nix     | 1 -
 .../installer/sd-card/sd-image-raspberryp4-installer.nix    | 6 ++++++
 .../installer/sd-card/sd-image-raspberrypi-installer.nix    | 6 ++++++
 nixos/modules/installer/sd-card/sd-image-raspberrypi.nix    | 1 -
 8 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix
 create mode 100644 nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix
 create mode 100644 nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix
 create mode 100644 nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix
 create mode 100644 nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix

diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix
new file mode 100644
index 00000000000..b9e8a3ec81f
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../profiles/installation-device.nix
+    ./sd-image-aarch64.nix
+  ];
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix
new file mode 100644
index 00000000000..fdb6da31f4c
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../profiles/installation-device.nix
+    ./sd-image-aarch64-new-kernel.nix
+  ];
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
index e4ec2d6240d..ea696cbbc71 100644
--- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix
+++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix
@@ -5,7 +5,6 @@
 {
   imports = [
     ../../profiles/base.nix
-    ../../profiles/installation-device.nix
     ./sd-image.nix
   ];
 
diff --git a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix
new file mode 100644
index 00000000000..36b59b1ef93
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../profiles/installation-device.nix
+    ./sd-image-armv7l-multiplatform.nix
+  ];
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
index d2ba611532e..08f2fbaaaf2 100644
--- a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
@@ -5,7 +5,6 @@
 {
   imports = [
     ../../profiles/base.nix
-    ../../profiles/installation-device.nix
     ./sd-image.nix
   ];
 
diff --git a/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix
new file mode 100644
index 00000000000..8f2715569be
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../profiles/installation-device.nix
+    ./sd-image-raspberrypi4.nix
+  ];
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix
new file mode 100644
index 00000000000..6bfbeb3cfcd
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../profiles/installation-device.nix
+    ./sd-image-raspberrypi.nix
+  ];
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
index 40a01f96177..d16d2d0fa28 100644
--- a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
@@ -5,7 +5,6 @@
 {
   imports = [
     ../../profiles/base.nix
-    ../../profiles/installation-device.nix
     ./sd-image.nix
   ];
 

From 481f68f1a58df48003ccfb2a5aac381e209f6324 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Tue, 2 Feb 2021 16:03:20 -0500
Subject: [PATCH 3/5] installer: add back-compat files for sd-card image folder
 move

---
 .../modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix | 5 +++++
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix          | 5 +++++
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix       | 5 +++++
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix      | 5 +++++
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix     | 5 +++++
 nixos/modules/installer/cd-dvd/sd-image.nix                  | 5 +++++
 6 files changed, 30 insertions(+)
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image.nix

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
new file mode 100644
index 00000000000..923c775c17a
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image-aarch64-new-kernel-installer.nix
+  ];
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
new file mode 100644
index 00000000000..b2062801021
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image-aarch64-installer.nix
+  ];
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
new file mode 100644
index 00000000000..15ddf0ad23b
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image-armv7l-multiplatform-installer.nix
+  ];
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
new file mode 100644
index 00000000000..3a67546a50f
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image-raspberrypi-installer.nix
+  ];
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
new file mode 100644
index 00000000000..e57bc37a45d
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image-raspberrypi4-installer.nix
+  ];
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
new file mode 100644
index 00000000000..aca446d097d
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../sd-card/sd-image.nix
+  ];
+}

From 1009c09b4f6de5b13dcec246b7ef37afca3cf47b Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Tue, 2 Feb 2021 16:14:06 -0500
Subject: [PATCH 4/5] installer: amend release with sd-card file move

---
 nixos/release.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 109747945f7..327a259de7f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -171,23 +171,23 @@ in rec {
 
   sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage {
     module = {
-        armv6l-linux = ./modules/installer/cd-dvd/sd-image-raspberrypi.nix;
-        armv7l-linux = ./modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix;
-        aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64.nix;
+        armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix;
+        armv7l-linux = ./modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix;
+        aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-installer.nix;
       }.${system};
     inherit system;
   });
 
   sd_image_new_kernel = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
     module = {
-        aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix;
+        aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix;
       }.${system};
     type = "minimal-new-kernel";
     inherit system;
   });
 
   sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
-    module = ./modules/installer/cd-dvd/sd-image-raspberrypi4.nix;
+    module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix;
     inherit system;
   });
 

From 68afbf9d6385032be9fc368dbfa4ad4ba2cc45e0 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Tue, 2 Feb 2021 17:40:46 -0500
Subject: [PATCH 5/5] installer: add deprecation warning about sd-card file
 move

---
 .../installer/cd-dvd/sd-image-aarch64-new-kernel.nix     | 9 +++++++++
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix      | 9 +++++++++
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix   | 9 +++++++++
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix  | 9 +++++++++
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | 9 +++++++++
 nixos/modules/installer/cd-dvd/sd-image.nix              | 9 +++++++++
 6 files changed, 54 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
index 923c775c17a..a669d61571f 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image-aarch64-new-kernel-installer.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead.
+      ''
+    ];
+  };
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index b2062801021..76c1509b8f7 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image-aarch64-installer.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead.
+      ''
+    ];
+  };
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 15ddf0ad23b..6ee0eb9e9b8 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image-armv7l-multiplatform-installer.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead.
+      ''
+    ];
+  };
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 3a67546a50f..747440ba9c6 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image-raspberrypi-installer.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead.
+      ''
+    ];
+  };
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
index e57bc37a45d..79db1fa29bc 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image-raspberrypi4-installer.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead.
+      ''
+    ];
+  };
 }
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index aca446d097d..e2d6dcb3fe3 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -1,5 +1,14 @@
+{ config, ... }:
 {
   imports = [
     ../sd-card/sd-image.nix
   ];
+  config = {
+    warnings = [
+      ''
+      .../cd-dvd/sd-image.nix is deprecated and will eventually be removed.
+      Please switch to .../sd-card/sd-image.nix, instead.
+      ''
+    ];
+  };
 }