5 files changed, 43 insertions, 22 deletions
diff --git a/common.nix b/common.nix
index 4da5dbb..c2695ab 100644
--- a/common.nix
+++ b/common.nix
@@ -26,11 +26,7 @@ in
 
   boot = {
     tmp.useTmpfs = true;
-    loader = {
-      timeout = 1;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
+    loader.timeout = 1;
   };
 
   users.users.${user} = {
diff --git a/hosts/cez/hardware-configuration.nix b/hosts/cez/hardware-configuration.nix
index a1107c1..19313e5 100644
--- a/hosts/cez/hardware-configuration.nix
+++ b/hosts/cez/hardware-configuration.nix
@@ -4,6 +4,11 @@
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
     kernelModules = [ "kvm-amd" ];
     initrd = {
       availableKernelModules = [
@@ -15,7 +20,8 @@
         "sdhci_pci"
       ];
 
-      luks.devices."crypt".device = "/dev/disk/by-uuid/84acd784-caad-41a1-a2e4-39468d01fefd";
+      luks.devices."crypt".device =
+        "/dev/disk/by-uuid/84acd784-caad-41a1-a2e4-39468d01fefd";
     };
   };
 
diff --git a/hosts/dspace/hardware-configuration.nix b/hosts/dspace/hardware-configuration.nix
index c355e8b..aaad3b7 100644
--- a/hosts/dspace/hardware-configuration.nix
+++ b/hosts/dspace/hardware-configuration.nix
@@ -3,14 +3,21 @@
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
+  };
 
   fileSystems = {
     "/" = {
diff --git a/hosts/fscusat/hardware-configuration.nix b/hosts/fscusat/hardware-configuration.nix
index 3913e1e..8bb54ed 100644
--- a/hosts/fscusat/hardware-configuration.nix
+++ b/hosts/fscusat/hardware-configuration.nix
@@ -3,14 +3,21 @@
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
+  };
 
   fileSystems = {
     "/" = {
diff --git a/hosts/kay/hardware-configuration.nix b/hosts/kay/hardware-configuration.nix
index 3299f3f..306e9ba 100644
--- a/hosts/kay/hardware-configuration.nix
+++ b/hosts/kay/hardware-configuration.nix
@@ -4,6 +4,11 @@
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
     kernelModules = [ "kvm-intel" ];
     blacklistedKernelModules = [ "nouveau" ];
     initrd.availableKernelModules = [