From 4e05d4a253eaba984c18dc169e02bf99f9ca3c37 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 23 Sep 2021 19:39:35 +0200
Subject: [PATCH] flake.nix: try moving import of sd-image-aarch64.nix to the
 nixosModule

---
 flake.nix       | 2 --
 lib/default.nix | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index e2f2cd17..bbffbf62 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,7 +214,6 @@
 
         pulsebert = nixosSystem' {
           modules = [
-            "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
             ./hosts/pulsebert
           ];
           system = "aarch64-linux";
@@ -222,7 +221,6 @@
 
         radiobert = nixosSystem' {
           modules = [
-            "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
             ./hosts/radiobert
           ];
           system = "aarch64-linux";
diff --git a/lib/default.nix b/lib/default.nix
index e49cc037..f637ecb6 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,7 +2,7 @@
 # That includes physical servers, VMs, containers, and personal machines.
 #
 
-{ config, lib, pkgs, ... }:
+{ inputs, config, lib, pkgs, ... }:
 
 let
   hqPrefix64 = "fd23:42:c3d2:523";
@@ -31,7 +31,8 @@ in {
     ./users
     ./stats.nix
     ./openwebrx.nix
-  ];
+  ]
+  ++ lib.optional config.boot.loader.raspberryPi.enable "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix";
 
   options.c3d2 = with lib;
     with lib.types; {