treewide: Migrate to new nvidia modules

This commit is contained in:
Tristan Daniël Maat 2022-11-13 01:54:59 +00:00
parent 7e60458d86
commit cdd049a353
No known key found for this signature in database
GPG Key ID: 49670FD774E43268
22 changed files with 22 additions and 22 deletions

View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd/pstate.nix ../../../common/cpu/amd/pstate.nix
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
../../battery.nix ../../battery.nix

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../default.nix ../default.nix
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {

View File

@ -5,7 +5,7 @@
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop ../../../common/pc/laptop
# To just use Intel integrated graphics with Intel's open source driver # To just use Intel integrated graphics with Intel's open source driver
# ../../../common/gpu/nvidia-disable # ../../../common/gpu/nvidia/disable.nix
]; ];
# TODO: boot loader # TODO: boot loader

View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../default.nix ../default.nix
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {

View File

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia-disable.nix ../../../../common/gpu/nvidia/disable.nix
../xps-common.nix ../xps-common.nix
]; ];
} }

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
../../../../common/pc/laptop ../../../../common/pc/laptop
../xps-common.nix ../xps-common.nix
]; ];

View File

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia-disable.nix ../../../../common/gpu/nvidia/disable.nix
../common.nix ../common.nix
]; ];
} }

View File

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
../common.nix ../common.nix
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd

View File

@ -4,7 +4,7 @@ in {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/amd ../../../common/gpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View File

@ -4,7 +4,7 @@
imports = [ imports = [
../. ../.
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {

View File

@ -3,7 +3,7 @@
../../../common/cpu/intel ../../../common/cpu/intel
# might need nvidia module but we don't know the PCI ids: # might need nvidia module but we don't know the PCI ids:
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740 # 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/acpi_call.nix
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../. ../.

View File

@ -1,6 +1,6 @@
{ config, lib, ... }: { { config, lib, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix

View File

@ -1,6 +1,6 @@
{ lib, config, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../. ../.

View File

@ -4,7 +4,7 @@
imports = [ imports = [
../../common/pc/laptop/ssd ../../common/pc/laptop/ssd
../../common/cpu/intel ../../common/cpu/intel
../../common/gpu/nvidia.nix ../../common/gpu/nvidia/prime.nix
../../common/pc/laptop ../../common/pc/laptop
]; ];

View File

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../common/cpu/amd ../../common/cpu/amd
../../common/gpu/nvidia.nix ../../common/gpu/nvidia/prime.nix
../../common/pc/laptop ../../common/pc/laptop
../../common/pc/ssd ../../common/pc/ssd
]; ];