mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/master' into nixfmt
This commit is contained in:
		@@ -14,7 +14,10 @@
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  boot.kernelModules = [ "amdgpu" ];
 | 
			
		||||
  services.xserver.videoDrivers = [ "nvidia" ];
 | 
			
		||||
  services.xserver.videoDrivers = [
 | 
			
		||||
    "amdgpu"
 | 
			
		||||
    "nvidia"
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  hardware = {
 | 
			
		||||
    amdgpu.initrd.enable = false;
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,8 @@
 | 
			
		||||
  lib,
 | 
			
		||||
  config,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
  imports = [
 | 
			
		||||
    ../../../common/cpu/intel
 | 
			
		||||
    ../../../common/gpu/nvidia/prime.nix
 | 
			
		||||
@@ -12,7 +13,7 @@
 | 
			
		||||
    ../../../common/hidpi.nix
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  boot.extraModulePackages = [config.boot.kernelPackages.lenovo-legion-module];
 | 
			
		||||
  boot.extraModulePackages = [ config.boot.kernelPackages.lenovo-legion-module ];
 | 
			
		||||
 | 
			
		||||
  hardware = {
 | 
			
		||||
    nvidia = {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user