diff --git a/README.md b/README.md index 1bf859ab..2fb3bcc9 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,8 @@ See code for all available configurations. | [Dell Latitude E7240](dell/latitude/e7240) | `` | | [Dell Optiplex 3050](dell/optiplex/3050) | `` | | [Dell Poweredge R7515](dell/poweredge/r7515) | `` | -| [Dell Precision 3490](dell/precision/3490) | `` | +| [Dell Precision 3490, nvidia](dell/precision/3490/nvidia) | `` | +| [Dell Precision 3490, intel](dell/precision/3490/intel) | `` | | [Dell Precision 3541](dell/precision/3541) | `` | | [Dell Precision 5490](dell/precision/5490) | `` | | [Dell Precision 5530](dell/precision/5530) | `` | diff --git a/dell/precision/3490/default.nix b/dell/precision/3490/default.nix index c579f880..08d80d2f 100644 --- a/dell/precision/3490/default.nix +++ b/dell/precision/3490/default.nix @@ -1,21 +1,16 @@ { + warnings = [ + '' + DEPRECATED: The module has been deprecated. + + Either use + + for NVIDIA graphics or + + for Intel graphics. + '' + ]; imports = [ - ../../../common/cpu/intel/meteor-lake - ../../../common/gpu/nvidia/ada-lovelace - ../../../common/pc/laptop + ./nvidia/default.nix ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "sd_mod" - "thunderbolt" - "usb_storage" - "vmd" - "xhci_pci" - ]; - - hardware.nvidia.prime = { - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; } diff --git a/dell/precision/3490/intel/default.nix b/dell/precision/3490/intel/default.nix new file mode 100644 index 00000000..a5678040 --- /dev/null +++ b/dell/precision/3490/intel/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../shared.nix + ]; +} diff --git a/dell/precision/3490/nvidia/default.nix b/dell/precision/3490/nvidia/default.nix new file mode 100644 index 00000000..379ea1f5 --- /dev/null +++ b/dell/precision/3490/nvidia/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + ../shared.nix + ../../../../common/gpu/nvidia/ada-lovelace + ]; + + + hardware.nvidia.prime = { + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; +} diff --git a/dell/precision/3490/shared.nix b/dell/precision/3490/shared.nix new file mode 100644 index 00000000..a4de2011 --- /dev/null +++ b/dell/precision/3490/shared.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../../common/cpu/intel/meteor-lake + ../../../common/pc/laptop + ]; +} diff --git a/flake.nix b/flake.nix index 048a59b7..97a3aef2 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,11 @@ dell-latitude-e7240 = import ./dell/latitude/e7240; dell-optiplex-3050 = import ./dell/optiplex/3050; dell-poweredge-r7515 = import ./dell/poweredge/r7515; - dell-precision-3490 = import ./dell/precision/3490; + dell-precision-3490 = + deprecated "1491" "dell-precision-3490" + (import ./dell/precision/3490); + dell-precision-3490-nvidia = import ./dell/precision/3490/nvidia; + dell-precision-3490-intel = import ./dell/precision/3490/intel; dell-precision-3541 = import ./dell/precision/3541; dell-precision-5490 = import ./dell/precision/5490; dell-precision-5530 = import ./dell/precision/5530;