From 347d3598634ca7bf6cb8eb2d96e2a8e5d2c01f98 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 4 Jun 2024 17:39:17 +0200
Subject: [PATCH] Correct boot module structure

---
 hosts/inspiron/default.nix                   | 4 ++--
 hosts/north/default.nix                      | 4 ++--
 modules/system/{boot-loader.nix => boot.nix} | 8 ++++----
 modules/system/default.nix                   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename modules/system/{boot-loader.nix => boot.nix} (77%)

diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index 2bafe66..d25a1c7 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -8,8 +8,8 @@
   networking.hostName = "inspiron";
 
   myConfig = {
-    boot-loader = {
-      systemd-boot.enable = true;
+    boot = {
+      loader.systemd-boot.enable = true;
       silent = true;
     };
 
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 55a39e1..7bba78e 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -8,8 +8,8 @@
   networking.hostName = "north";
 
   myConfig = {
-    boot-loader = {
-      systemd-boot.enable = true;
+    boot = {
+      loader.systemd-boot.enable = true;
       silent = true;
     };
 
diff --git a/modules/system/boot-loader.nix b/modules/system/boot.nix
similarity index 77%
rename from modules/system/boot-loader.nix
rename to modules/system/boot.nix
index 0dd60b9..dd19bba 100644
--- a/modules/system/boot-loader.nix
+++ b/modules/system/boot.nix
@@ -1,12 +1,12 @@
 { config, lib, ... }:
 {
-  options.myConfig.boot-loader = {
-    systemd-boot.enable = lib.mkEnableOption "";
+  options.myConfig.boot = {
+    loader.systemd-boot.enable = lib.mkEnableOption "";
     silent = lib.mkEnableOption "";
   };
 
   config = lib.mkMerge [
-    (lib.mkIf config.myConfig.boot-loader.systemd-boot.enable {
+    (lib.mkIf config.myConfig.boot.loader.systemd-boot.enable {
       boot.tmp.cleanOnBoot = true;
       boot.loader = {
         systemd-boot = {
@@ -20,7 +20,7 @@
       systemd.watchdog.rebootTime = "10";
     })
 
-    (lib.mkIf config.myConfig.boot-loader.silent {
+    (lib.mkIf config.myConfig.boot.silent {
       boot = {
         kernelParams = [
           "quiet"
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 7be0959..043330e 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -10,7 +10,7 @@
     ./de.nix
     ./dm.nix
     ./sound.nix
-    ./boot-loader.nix
+    ./boot.nix
     ./printing.nix
     ./syncthing.nix
     ./nix-helper.nix