6 files changed, 16 insertions, 16 deletions
diff --git a/hosts/aptos/hardware.nix b/hosts/aptos/hardware.nix
index afe3840..01e2a96 100644
--- a/hosts/aptos/hardware.nix
+++ b/hosts/aptos/hardware.nix
@@ -8,7 +8,6 @@
 
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
diff --git a/hosts/carmel/boot.nix b/hosts/carmel/boot.nix
index 5beb31b..c867bfb 100644
--- a/hosts/carmel/boot.nix
+++ b/hosts/carmel/boot.nix
@@ -8,7 +8,6 @@
         # see https://www.man7.org/linux/man-pages/man5/loader.conf.5.html
         consoleMode = "max";
       };
-      efi.canTouchEfiVariables = true;
       efi.efiSysMountPoint = "/boot/efi";
     };
 
diff --git a/hosts/carmel/hardware.nix b/hosts/carmel/hardware.nix
index 3293d3a..44f46ae 100644
--- a/hosts/carmel/hardware.nix
+++ b/hosts/carmel/hardware.nix
@@ -8,7 +8,6 @@
 
   boot.initrd.availableKernelModules =
     [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
diff --git a/hosts/tahoe/hardware.nix b/hosts/tahoe/hardware.nix
index 4b5937c..83e434f 100644
--- a/hosts/tahoe/hardware.nix
+++ b/hosts/tahoe/hardware.nix
@@ -8,7 +8,6 @@
 
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
diff --git a/modules/system/boot/default.nix b/modules/system/boot/default.nix
index 30030c6..b223336 100644
--- a/modules/system/boot/default.nix
+++ b/modules/system/boot/default.nix
@@ -10,18 +10,6 @@ in
 
   config = {
     boot = {
-      loader = {
-        # Use the systemd-boot EFI boot loader.
-        systemd-boot.enable = true;
-        # Prohibits gaining root access by passing init=/bin/sh as a kernel parameter
-        systemd-boot.editor = false;
-        efi.canTouchEfiVariables = true;
-      };
-
-      kernelPackages = pkgs.linuxPackages_latest;
-      cleanTmpDir = true;
-      tmpOnTmpfs = true;
-
       initrd = {
         network = lib.mkIf cfg.initrd.network.enable {
           enable = true;
diff --git a/profiles/default.nix b/profiles/default.nix
index 31e044a..4575b13 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -1,5 +1,21 @@
 { pkgs, config, lib, ... }:
 {
+
+  boot = {
+    loader = {
+      # Use the systemd-boot EFI boot loader.
+      systemd-boot.enable = true;
+      # Prohibits gaining root access by passing init=/bin/sh as a
+      # kernel parameter
+      systemd-boot.editor = false;
+      efi.canTouchEfiVariables = true;
+    };
+
+    kernelPackages = pkgs.linuxPackages_latest;
+    cleanTmpDir = true;
+    tmpOnTmpfs = true;
+  };
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";