From cb2c94c4d95d5749a61cee25b06d2043f55db6e8 Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Fri, 12 Dec 2025 21:44:58 +1100
Subject: [PATCH] bootloaders: split bootloaders into seperate files

---
 flake.nix                                    |  1 +
 hosts/nixos-common.nix                       |  2 --
 modules/hardware/bootloader/limine.nix       | 23 ++++++++++++++++++++
 modules/hardware/bootloader/systemd-boot.nix |  9 ++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 modules/hardware/bootloader/limine.nix
 create mode 100644 modules/hardware/bootloader/systemd-boot.nix

diff --git a/flake.nix b/flake.nix
index 6505f68..66415f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,7 @@
         ./modules/users/nico.nix
         ./modules/users/alex.nix
         ./modules/hardware/secureboot.nix
+        ./modules/hardware/bootloader/systemd-boot.nix
         lanzaboote.nixosModules.lanzaboote
 
         ./hosts/nijika/configuration.nix
diff --git a/hosts/nixos-common.nix b/hosts/nixos-common.nix
index 12733a2..2187618 100644
--- a/hosts/nixos-common.nix
+++ b/hosts/nixos-common.nix
@@ -6,9 +6,7 @@
 
 {
   # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.timeout = 0;
 
   # Networking
   networking.networkmanager.enable = true;
diff --git a/modules/hardware/bootloader/limine.nix b/modules/hardware/bootloader/limine.nix
new file mode 100644
index 0000000..1bf78ee
--- /dev/null
+++ b/modules/hardware/bootloader/limine.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+{
+  boot.loader.limine = {
+    enable = true;
+    validateChecksums = true;
+    panicOnChecksumMismatch = true;
+    enableEditor = false;
+
+
+    extraEntries =
+''
+/memtest86
+  protocol: chainload
+  path: boot():///efi/memtest86/memtest86.efi
+'';
+    additionalFiles = { 
+      "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
+    };
+
+    secureBoot.enable = true;
+  };
+}
diff --git a/modules/hardware/bootloader/systemd-boot.nix b/modules/hardware/bootloader/systemd-boot.nix
new file mode 100644
index 0000000..5648970
--- /dev/null
+++ b/modules/hardware/bootloader/systemd-boot.nix
@@ -0,0 +1,9 @@
+{ config, ... }:
+
+{
+  boot.loader.systemd-boot = {
+    enable = true;
+  };
+
+  boot.loader.timeout = 0;
+}