diff --git a/hosts/default/bootloader.nix b/hosts/default/bootloader.nix
new file mode 100644
index 0000000..d3c6aaf
--- /dev/null
+++ b/hosts/default/bootloader.nix
@@ -0,0 +1,21 @@
+{
+  boot = {
+    # https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
+    # early KMS over HDMI
+    kernelParams = [
+      "quiet"
+      "splash"
+      "video=HDMI-1:1920x1080@60"
+    ];
+    initrd.availableKernelModules = [ "i915" ];
+
+    loader = {
+      systemd-boot = {
+        enable = true;
+        editor = false;
+      };
+      efi.canTouchEfiVariables = true;
+    };
+    initrd.systemd.enable = true;
+  };
+}
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 26dc8ac..a31293e 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -6,41 +6,21 @@
 
 {
   imports = [
+    ./bootloader.nix
     ./hardware-configuration.nix
     ./filesystem-hardening.nix
+    ./desktops/kde.nix
+    ./locale.nix
     # ./phone-as-webcam.nix
     # ./virtualization.nix
-    ./desktops/kde.nix
-    # ./sticky-keys.nix
-    ./locale.nix
     inputs.home-manager.nixosModules.home-manager
     inputs.nix-index-database.nixosModules.nix-index
     inputs.stylix.nixosModules.stylix
-    # uni requires us to use uv for python
+    # uni requires uv for python
     # TODO: Restore binary isolation
     inputs.nix-ld.nixosModules.nix-ld
   ];
 
-  boot = {
-    # https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
-    # early KMS over HDMI
-    kernelParams = [
-      "quiet"
-      "splash"
-      "video=HDMI-1:1920x1080@60"
-    ];
-    initrd.availableKernelModules = [ "i915" ];
-
-    loader = {
-      systemd-boot = {
-        enable = true;
-        editor = false;
-      };
-      efi.canTouchEfiVariables = true;
-    };
-    initrd.systemd.enable = true;
-  };
-
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.h = import ./home;