eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-23 11:29:42 +01:00
Code Issues Releases Wiki Activity

Merge #551

Browse source 
551: Fix conflict to 2a7130d13a r=Mic92 a=LostAttractor



Co-authored-by: ChaosAttractor <lostattractor@gmail.com>
This commit is contained in:
bors[bot] 2023-02-09 08:59:02 +00:00 committed by GitHub
commit 299fe76828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
asus/rog-strix/g733qs/default.nix
View file

@ -22,7 +22,6 @@
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest); boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest);
hardware.nvidia.prime = { hardware.nvidia.prime = {
offload.enable = lib.mkDefault true;
amdgpuBusId = "PCI:5:0:0"; amdgpuBusId = "PCI:5:0:0";
nvidiaBusId = "PCI:1:0:1"; nvidiaBusId = "PCI:1:0:1";
}; };

2
common/gpu/nvidia/prime.nix
View file

@ -16,7 +16,7 @@ in {
environment.systemPackages = [ nvidia-offload ]; environment.systemPackages = [ nvidia-offload ];
hardware.nvidia.prime = { hardware.nvidia.prime = {
offload.enable = lib.mkDefault true; offload.enable = lib.mkOverride 990 true;
# Hardware should specify the bus ID for intel/nvidia devices # Hardware should specify the bus ID for intel/nvidia devices
}; };
} }