Merge pull request #1268 from NixOS/e14-intel

Mic92 · web-flow · commit 8bf8a2a08223 · 2025-04-23T09:10:33.000+02:00
E14-intel: import intel comet lake
diff --git a/common/cpu/intel/comet-lake/default.nix b/common/cpu/intel/comet-lake/default.nix
@@ -3,4 +3,6 @@
     ./cpu-only.nix
     ../../../gpu/intel/comet-lake
   ];
+
+  hardware.intelgpu.vaapiDriver = "intel-media-driver";
 }
diff --git a/lenovo/thinkpad/e14/intel/default.nix b/lenovo/thinkpad/e14/intel/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../../common/cpu/intel
+    ../../../../common/cpu/intel/comet-lake
   ];
 
   services.throttled.enable = lib.mkDefault true;

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,6 @@`
`3`	`3`	`./cpu-only.nix`
`4`	`4`	`../../../gpu/intel/comet-lake`
`5`	`5`	`];`
	`6`	`+`
	`7`	`+ hardware.intelgpu.vaapiDriver = "intel-media-driver";`
`6`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`imports = [`
`5`	`5`	`../.`
`6`		`- ../../../../common/cpu/intel`
	`6`	`+ ../../../../common/cpu/intel/comet-lake`
`7`	`7`	`];`
`8`	`8`
`9`	`9`	`services.throttled.enable = lib.mkDefault true;`