From 1c84c314db42dd40ed6cf9293b9451ec2e7ebee4 Mon Sep 17 00:00:00 2001
From: 4JX <79868816+4JX@users.noreply.github.com>
Date: Mon, 5 Aug 2024 01:27:42 +0200
Subject: [PATCH] 16ach6h: Use the hardware.display module

---
 lenovo/legion/16ach6h/edid/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lenovo/legion/16ach6h/edid/default.nix b/lenovo/legion/16ach6h/edid/default.nix
index 5e7d50f..481d1f5 100644
--- a/lenovo/legion/16ach6h/edid/default.nix
+++ b/lenovo/legion/16ach6h/edid/default.nix
@@ -8,10 +8,16 @@ let
   '';
 in
 {
-  hardware.firmware = [ chip_edid ];
+  hardware.display = {
+    edid.packages = [ chip_edid ];
+
+    outputs = {
+      # For some reason, the internal display is sometimes eDP-1, and sometimes it's eDP-2
+      "eDP-1".edid = "16ach6h.bin";
+      "eDP-2".edid = "16ach6h.bin";
+    };
+  };
 
-  # For some reason, the internal display is sometimes eDP-1, and sometimes it's eDP-2
-  boot.kernelParams = [ "drm.edid_firmware=eDP-1:edid/16ach6h.bin,eDP-2:edid/16ach6h.bin" ];
 
   # This fails at the moment, https://github.com/NixOS/nixos-hardware/issues/795
   # Extra refresh rates seem to work regardless