diff --git a/modules/boot/bootloader.nix b/modules/boot/bootloader.nix
deleted file mode 100644
index a5e43b7..0000000
--- a/modules/boot/bootloader.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, ... }:
-
-{
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    tmp.useTmpfs = config.host.highRam;
-  };
-}
diff --git a/modules/boot/default.nix b/modules/boot/default.nix
deleted file mode 100644
index 64e374e..0000000
--- a/modules/boot/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, config, ... }:
-
-let
-  cfg = config.bootloader;
-in
-{
-  options.bootloader.enable = lib.mkEnableOption "system bootloader";
-
-  config = lib.mkIf cfg.enable {
-    boot = {
-      loader = {
-        systemd-boot.enable = true;
-        efi.canTouchEfiVariables = true;
-      };
-      tmp.useTmpfs = config.host.highRam;
-    };
-  };
-}
diff --git a/modules/bootloader/default.nix b/modules/bootloader/default.nix
new file mode 100644
index 0000000..50f5134
--- /dev/null
+++ b/modules/bootloader/default.nix
@@ -0,0 +1,17 @@
+{ lib, config, ... }:
+
+{
+  options.bootloader.enable = lib.mkOption {
+    default = false;
+    type = lib.types.bool;
+  };
+
+  config = lib.mkIf config.bootloader.enable {
+    boot = {
+      loader = {
+        systemd-boot.enable = true;
+        efi.canTouchEfiVariables = true;
+      };
+    };
+  };
+}
diff --git a/modules/tmp/default.nix b/modules/tmp/default.nix
new file mode 100644
index 0000000..ba96e78
--- /dev/null
+++ b/modules/tmp/default.nix
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+{
+  options.tmp.enable = lib.mkOption {
+    default = config.host.highRam;
+    type = lib.types.bool;
+  };
+
+  config = lib.mkIf config.tmp.enable {
+    boot.tmp = {
+      useTmpfs = true;
+      tmpfsSize = "25%";
+    };
+  };
+}