From 07e43b0530503b6034eb82f47bb9ae4af34f9f93 Mon Sep 17 00:00:00 2001
From: 4JX <79868816+4JX@users.noreply.github.com>
Date: Fri, 19 Jan 2024 19:45:19 +0100
Subject: [PATCH] 16ach6h: Fix X11 setup

Fixes #628
---
 lenovo/legion/16ach6h/hybrid/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lenovo/legion/16ach6h/hybrid/default.nix b/lenovo/legion/16ach6h/hybrid/default.nix
index ab94e1c..6381e6a 100644
--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/lenovo/legion/16ach6h/hybrid/default.nix
@@ -11,6 +11,15 @@
     ../edid
   ];
 
+  # Still needs to load at some point if we want X11 to work
+  boot.kernelModules = [ "amdgpu" ];
+
+  # modesetting just doesn't work (on X11?), so get rid of it by only explicitly declaring nvidia
+  # Needed due to https://github.com/NixOS/nixos-hardware/commit/630a8e3e4eea61d35524699f2f59dbc64886357d
+  # See also https://github.com/NixOS/nixos-hardware/issues/628
+  # options.services.xserver.drivers will have a amdgpu entry from using the prime stuff in nixpkgs
+  services.xserver.videoDrivers = [ "nvidia" ];
+
   hardware = {
     amdgpu.loadInInitrd = lib.mkDefault false;
 
@@ -24,4 +33,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}