From b081de56dfc51d2b5b648d6ae2b106deeeb49d00 Mon Sep 17 00:00:00 2001
From: piousdeer <31318219+piousdeer@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:10:15 +0700
Subject: [PATCH] 16ach6h: re-enable edid for internal display only

---
 lenovo/legion/16ach6h/edid/default.nix   | 4 +++-
 lenovo/legion/16ach6h/hybrid/default.nix | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lenovo/legion/16ach6h/edid/default.nix b/lenovo/legion/16ach6h/edid/default.nix
index 81c44d5..5e7d50f 100644
--- a/lenovo/legion/16ach6h/edid/default.nix
+++ b/lenovo/legion/16ach6h/edid/default.nix
@@ -10,7 +10,9 @@ in
 {
   hardware.firmware = [ chip_edid ];
 
-  boot.kernelParams = [ "drm.edid_firmware=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
   # boot.initrd.extraFiles."lib/firmware/edid/16ach6h.bin".source = pkgs.runCommandLocal "chip_edid" { } "cp ${./16ach6h.bin} $out";
diff --git a/lenovo/legion/16ach6h/hybrid/default.nix b/lenovo/legion/16ach6h/hybrid/default.nix
index f1b4c9e..51e10dc 100644
--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/lenovo/legion/16ach6h/hybrid/default.nix
@@ -8,8 +8,7 @@
     ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/pc/laptop
     ../../../../common/pc/laptop/ssd
-    # This seems to break extra monitor modes
-    # ../edid
+    ../edid
   ];
 
   # Still needs to load at some point if we want X11 to work