From 835036fc6a20346512978b67ca894fda87615f6b Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Thu, 23 Jun 2022 15:31:19 -0700
Subject: [PATCH] make image.nix a first-class module

---
 flake.nix                      | 2 +-
 modules/default.nix            | 1 +
 image.nix => modules/image.nix | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename image.nix => modules/image.nix (100%)

diff --git a/flake.nix b/flake.nix
index 62be100d..dccc6ab1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,7 +92,7 @@
     #   boot, checkout this flake into /etc/nixos AND UPDATE THE UUIDS IT REFERENCES.
     #   then `nixos-rebuild ...`
     decl-img = { name, system, extraModules ? [] }: (
-      (self.decl-machine { inherit name system; extraModules = extraModules ++ [./image.nix]; })
+      (self.decl-machine { inherit name system extraModules; })
         .config.system.build.img
     );
 
diff --git a/modules/default.nix b/modules/default.nix
index 29c1b305..e4eaad3f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./gui
     ./hardware
+    ./image.nix
     ./impermanence.nix
     ./services/duplicity.nix
     ./universal
diff --git a/image.nix b/modules/image.nix
similarity index 100%
rename from image.nix
rename to modules/image.nix