diff --git a/hosts/rico0/default.nix b/hosts/rico0/default.nix
index e0c3429..0b1687b 100644
--- a/hosts/rico0/default.nix
+++ b/hosts/rico0/default.nix
@@ -8,7 +8,8 @@
     ./security.nix
   ];
 
-nixpkgs.overlays = [
+  # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243
+  nixpkgs.overlays = [
     (final: super: {
       makeModulesClosure = x:
         super.makeModulesClosure (x // { allowMissing = true; });
diff --git a/hosts/rico0/hardware/default.nix b/hosts/rico0/hardware/default.nix
index cdacf9a..b66d27a 100644
--- a/hosts/rico0/hardware/default.nix
+++ b/hosts/rico0/hardware/default.nix
@@ -1,13 +1,24 @@
-_: {
-  imports = [ ./filesystem.nix ./kernel.nix ];
+{ lib, pkgs, ... }: {
+  imports = [ ./filesystem.nix ];
 
   hardware.enableRedistributableFirmware = true;
 
   boot = {
+    consoleLogLevel = 3;
+    initrd = {
+      availableKernelModules = [ "xhci_pci" ];
+      systemd.enable = true;
+    };
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
+    kernel.sysctl = {
+      "vm.swappiness" = 10;
+      "vm.dirty_ratio" = 3;
+    };
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
     supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico0/hardware/kernel.nix b/hosts/rico0/hardware/kernel.nix
deleted file mode 100644
index e8c6feb..0000000
--- a/hosts/rico0/hardware/kernel.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib
-, pkgs
-, ...
-}: {
-  boot = {
-    consoleLogLevel = 3;
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
-    kernel.sysctl = {
-      "vm.swappiness" = 10;
-      "vm.dirty_ratio" = 3;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" ];
-      systemd.enable = true;
-    };
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-}
diff --git a/hosts/rico1/default.nix b/hosts/rico1/default.nix
index 4b107e0..0b1687b 100644
--- a/hosts/rico1/default.nix
+++ b/hosts/rico1/default.nix
@@ -8,6 +8,7 @@
     ./security.nix
   ];
 
+  # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243
   nixpkgs.overlays = [
     (final: super: {
       makeModulesClosure = x:
diff --git a/hosts/rico1/hardware/default.nix b/hosts/rico1/hardware/default.nix
index cdacf9a..b66d27a 100644
--- a/hosts/rico1/hardware/default.nix
+++ b/hosts/rico1/hardware/default.nix
@@ -1,13 +1,24 @@
-_: {
-  imports = [ ./filesystem.nix ./kernel.nix ];
+{ lib, pkgs, ... }: {
+  imports = [ ./filesystem.nix ];
 
   hardware.enableRedistributableFirmware = true;
 
   boot = {
+    consoleLogLevel = 3;
+    initrd = {
+      availableKernelModules = [ "xhci_pci" ];
+      systemd.enable = true;
+    };
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
+    kernel.sysctl = {
+      "vm.swappiness" = 10;
+      "vm.dirty_ratio" = 3;
+    };
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
     supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico1/hardware/kernel.nix b/hosts/rico1/hardware/kernel.nix
deleted file mode 100644
index e8c6feb..0000000
--- a/hosts/rico1/hardware/kernel.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib
-, pkgs
-, ...
-}: {
-  boot = {
-    consoleLogLevel = 3;
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
-    kernel.sysctl = {
-      "vm.swappiness" = 10;
-      "vm.dirty_ratio" = 3;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" ];
-      systemd.enable = true;
-    };
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-}
diff --git a/hosts/rico2/default.nix b/hosts/rico2/default.nix
index 4b107e0..0b1687b 100644
--- a/hosts/rico2/default.nix
+++ b/hosts/rico2/default.nix
@@ -8,6 +8,7 @@
     ./security.nix
   ];
 
+  # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243
   nixpkgs.overlays = [
     (final: super: {
       makeModulesClosure = x:
diff --git a/hosts/rico2/hardware/default.nix b/hosts/rico2/hardware/default.nix
index cdacf9a..b66d27a 100644
--- a/hosts/rico2/hardware/default.nix
+++ b/hosts/rico2/hardware/default.nix
@@ -1,13 +1,24 @@
-_: {
-  imports = [ ./filesystem.nix ./kernel.nix ];
+{ lib, pkgs, ... }: {
+  imports = [ ./filesystem.nix ];
 
   hardware.enableRedistributableFirmware = true;
 
   boot = {
+    consoleLogLevel = 3;
+    initrd = {
+      availableKernelModules = [ "xhci_pci" ];
+      systemd.enable = true;
+    };
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
+    kernel.sysctl = {
+      "vm.swappiness" = 10;
+      "vm.dirty_ratio" = 3;
+    };
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
     supportedFilesystems = [ "vfat" "btrfs" "ext4" ];
   };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 }
diff --git a/hosts/rico2/hardware/kernel.nix b/hosts/rico2/hardware/kernel.nix
deleted file mode 100644
index e8c6feb..0000000
--- a/hosts/rico2/hardware/kernel.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib
-, pkgs
-, ...
-}: {
-  boot = {
-    consoleLogLevel = 3;
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi4;
-    kernel.sysctl = {
-      "vm.swappiness" = 10;
-      "vm.dirty_ratio" = 3;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" ];
-      systemd.enable = true;
-    };
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-}