mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-05 01:37:24 +08:00
Merge #502
502: common/gpu/nvidia*: Migrate to common/gpu/nvidia/* and add non-prime r=Mic92 a=TLATER Co-authored-by: Tristan Daniël Maat <tristan.maat@codethink.co.uk>
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
../../../common/cpu/amd
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
|
||||
@@ -4,7 +4,7 @@ in {
|
||||
imports = [
|
||||
../../../common/cpu/amd
|
||||
../../../common/gpu/amd
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
../../../common/cpu/amd
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{
|
||||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
];
|
||||
|
||||
hardware.nvidia.prime = {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
../../../common/cpu/intel
|
||||
# might need nvidia module but we don't know the PCI ids:
|
||||
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
|
||||
#../../../common/gpu/nvidia.nix
|
||||
#../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, config, ... }: {
|
||||
imports = [
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ config, lib, ... }: {
|
||||
imports = [
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/cpu/intel
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, config, ... }: {
|
||||
imports = [
|
||||
../../../common/gpu/nvidia.nix
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../.
|
||||
|
||||
Reference in New Issue
Block a user