tree

2025-12-30 17:30:41 -06:00
parent b216fe5215
commit bf31786735
3 changed files with 4 additions and 3 deletions
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -167,7 +167,7 @@ in
      loader = {
        generic-extlinux-compatible = {
          enable = lib.mkDefault true;
-          useGenerationDeviceTree = false;
+          useGenerationDeviceTree = true;
        };
        grub.enable = lib.mkForce false;
      };
--- a/packages/raspberrypi/raspberrypi-overlays/default.nix
+++ b/packages/raspberrypi/raspberrypi-overlays/default.nix
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation rec {
  };

  installPhase = ''
-    mkdir -p $out/share/raspberrypi-overlays/
-    mv arch/arm/boot/dts/overlays/* "$out/share/raspberrypi-overlays/"
+    mkdir -p $out/dtbs/raspberrypi-overlays/
+    mv arch/arm/boot/dts/overlays/* "$out/dtbs/raspberrypi-overlays/"
  '';

  dontConfigure = true;
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -54,6 +54,7 @@
        disable-wifi.enable = true;
        modesetting.enable = true; 
        i2c.enable = true;
+        apply-overlays-dtmerge.enable = true;
      };
    };