From d3623248b7c08f26b91f100059488225f63e0e5f Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Wed, 11 Dec 2024 23:38:06 +0100
Subject: [PATCH] Update quitman-rpi4

---
 nixos/hosts/quitman-rpi4/default.nix | 35 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/nixos/hosts/quitman-rpi4/default.nix b/nixos/hosts/quitman-rpi4/default.nix
index b678d1da..6a49156b 100644
--- a/nixos/hosts/quitman-rpi4/default.nix
+++ b/nixos/hosts/quitman-rpi4/default.nix
@@ -7,13 +7,6 @@
   # Enable distributed Builds
   nix.distributedBuilds = true;
 
-  hardware = {
-    raspberry-pi."4".apply-overlays-dtmerge.enable = true;
-    deviceTree = {
-      enable = true;
-      filter = "*rpi-4-*.dtb";
-    };
-  };
   console.enable = true;
   environment.systemPackages = with pkgs; [
     libraspberrypi
@@ -26,22 +19,32 @@
   #####################################################################################
   # BEGIN hardware config
   #####################################################################################
+    boot = {
+      initrd.availableKernelModules = [
+        "xhci_pci"
+        "usbhid"
+        "usb_storage"
+        "vc4"
+        "pcie_brcmstb" # required for the pcie bus to work
+        "reset-raspberrypi" # required for vl805 firmware to load
+      ];
+      # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
+      loader.grub.enable = false;
+      # Enables the generation of /boot/extlinux/extlinux.conf
+      loader.generic-extlinux-compatible.enable = true;
 
-  # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
-  boot.loader.grub.enable = false;
-  # Enables the generation of /boot/extlinux/extlinux.conf
-  boot.loader.generic-extlinux-compatible.enable = true;
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+      initrd.kernelModules = [ ];
+      kernelModules = [ ];
+      extraModulePackages = [ ];
+    };
 
   fileSystems."/" = { 
     device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
     fsType = "ext4";
   };
 
+  hardware.enableRedistributableFirmware = true;
+  
   swapDevices = [ ];
   networking.useDHCP = lib.mkDefault true;
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";