From 61527d8c08f8dabcd4941c936b0c1dd20a2384a6 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 24 Nov 2024 20:46:35 -0500
Subject: [PATCH] Move systemd boot services into boot

---
 modules/system/boot/default.nix                               | 4 ----
 modules/system/default.nix                                    | 1 -
 modules/system/devices/boot/systemd/default.nix               | 2 ++
 .../systemd => devices/boot/systemd/services}/default.nix     | 0
 .../boot/systemd/services}/root-reset/default.nix             | 0
 5 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 modules/system/boot/default.nix
 rename modules/system/{boot/systemd => devices/boot/systemd/services}/default.nix (100%)
 rename modules/system/{boot/systemd => devices/boot/systemd/services}/root-reset/default.nix (100%)

diff --git a/modules/system/boot/default.nix b/modules/system/boot/default.nix
deleted file mode 100644
index 5a3869b..0000000
--- a/modules/system/boot/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./systemd ];
-}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index fb742ef..3502e88 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./accounts
-    ./boot
     ./devices
     ./options
     ./programs
diff --git a/modules/system/devices/boot/systemd/default.nix b/modules/system/devices/boot/systemd/default.nix
index a2c9a5d..8542def 100644
--- a/modules/system/devices/boot/systemd/default.nix
+++ b/modules/system/devices/boot/systemd/default.nix
@@ -1,5 +1,7 @@
 { ... }:
 {
+  imports = [ ./services ];
+
   boot.loader.systemd-boot = {
     enable = true;
     editor = false;
diff --git a/modules/system/boot/systemd/default.nix b/modules/system/devices/boot/systemd/services/default.nix
similarity index 100%
rename from modules/system/boot/systemd/default.nix
rename to modules/system/devices/boot/systemd/services/default.nix
diff --git a/modules/system/boot/systemd/root-reset/default.nix b/modules/system/devices/boot/systemd/services/root-reset/default.nix
similarity index 100%
rename from modules/system/boot/systemd/root-reset/default.nix
rename to modules/system/devices/boot/systemd/services/root-reset/default.nix