From 3742b84f6363316042c314aed707f8ec18be802a Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Mon, 11 Dec 2023 22:34:56 +0000
Subject: [PATCH] Apply hifiberry-digi-pro.dtbo overlay from nixpkgs

---
 hosts/pi/default.nix                | 7 +++++--
 hosts/pi/hardware-configuration.nix | 5 -----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hosts/pi/default.nix b/hosts/pi/default.nix
index c159dcf..b7b2cb9 100644
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -6,17 +6,20 @@
     ../server.nix
   ];
 
-  networking.hostName = "pi";
-  networking.hostId = "";
+  networking.hostId = "731d1660";
 
   hardware = {
     raspberry-pi."4" = {
       apply-overlays-dtmerge.enable = true;
+      audio = false;
       fkms-3d.enable = true;
     };
     deviceTree = {
       enable = true;
       filter = "*rpi-4-*.dtb";
+      overlays = [
+        { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
+      ];
     };
   };
 
diff --git a/hosts/pi/hardware-configuration.nix b/hosts/pi/hardware-configuration.nix
index 1718f25..4973e55 100644
--- a/hosts/pi/hardware-configuration.nix
+++ b/hosts/pi/hardware-configuration.nix
@@ -5,11 +5,6 @@
     <nixos-hardware/raspberry-pi/4>
   ];
 
-  boot.loader.raspberryPi.firmwareConfig = ''
-    dtoverlay=vc4-kms-v3d,noaudio
-    dtoverlay=hifiberry-digi-pro
-  '';
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";