diff --git a/flake.lock b/flake.lock
index 4eb81ff..43ce9fd 100755
--- a/flake.lock
+++ b/flake.lock
@@ -1295,6 +1295,22 @@
         "type": "github"
       }
     },
+    "pi4-nixos-hardware": {
+      "locked": {
+        "lastModified": 1747129300,
+        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "pi4-nixos-raspberrypi": {
       "inputs": {
         "argononed": "argononed_2",
@@ -1596,6 +1612,7 @@
         "pi4-disko": "pi4-disko",
         "pi4-home-manager": "pi4-home-manager",
         "pi4-impermanence": "pi4-impermanence",
+        "pi4-nixos-hardware": "pi4-nixos-hardware",
         "pi4-nixos-raspberrypi": "pi4-nixos-raspberrypi",
         "pi4-nixpkgs": "pi4-nixpkgs",
         "pi4-sops-nix": "pi4-sops-nix",
diff --git a/hosts/pi4/boot.nix b/hosts/pi4/boot.nix
index c0a4a6b..ed179a6 100755
--- a/hosts/pi4/boot.nix
+++ b/hosts/pi4/boot.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   boot = {
     loader = {
-        systemd-boot.enable = true;
+        systemd-boot.enable = lib.mkForce true;
         efi.canTouchEfiVariables = false;
+        generic-extlinux-compatible.enable = lib.mkForce false;
     };
     plymouth.enable = true;
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index 6e63a4a..db21923 100755
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -13,7 +13,8 @@ in
     ./boot.nix
     ./impermanence.nix
     ./networking.nix
-   ./sops.nix
+    ./pi4-hw.nix
+    ./sops.nix
     ../default.nix
   ];
   programs.zsh.enable = true;
diff --git a/hosts/pi4/pi4-hw.nix b/hosts/pi4/pi4-hw.nix
new file mode 100644
index 0000000..ca2370c
--- /dev/null
+++ b/hosts/pi4/pi4-hw.nix
@@ -0,0 +1,22 @@
+{ ... }:
+{
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = false;
+      audio.enable = false;
+      backlight.enable = false;
+      bluetooth.enable = false;
+      dwc2.enable = true;
+      i2c0.enable = false;
+      i2c1.enable = false;
+      leds = {
+        eth.disable = false;
+        act.disable = false;
+        pwr.disable = false;
+      };
+      fkms-3d.enable = false;
+      xhci.enable = true;
+    };
+    deviceTree.filter = "bcm2711-rpi-4*.dtb";
+  };
+}