From 938f82a4a9829b08beba62cfac32b7ad0b8e62da Mon Sep 17 00:00:00 2001 From: Malix Date: Tue, 3 Jun 2025 17:16:00 +0200 Subject: [PATCH 1/2] remove confusing acronym --- lenovo/legion/15ach6h/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lenovo/legion/15ach6h/README.md b/lenovo/legion/15ach6h/README.md index 19f6c247..63f4e97f 100644 --- a/lenovo/legion/15ach6h/README.md +++ b/lenovo/legion/15ach6h/README.md @@ -1,7 +1,7 @@ ## Introduction -Due to the introduction of DDG feature, you may toggle DDG frequently, so for the default settings of this laptop, we use "specialization" feature of Nix so that you can easily select the required graphics card driver in the startup menu. +Due to the introduction of Dual-Direct-GFX-Mode feature, you may toggle Dual-Direct-GFX-Mode frequently, so for the default settings of this laptop, we use "specialization" feature of Nix so that you can easily select the required graphics card driver in the startup menu. **But It will slow down NixOS evaluation by factor 2 and increase memory usage.** -So if you don't need specialization feature, you can just use hybrid only configuration or nvidia only (DDG only) configuration +So if you don't need specialization feature, you can just use hybrid only configuration or nvidia only (Dual-Direct-GFX-Mode only) configuration ## Using multiple drives with this configuration @@ -27,4 +27,4 @@ $ nix-info -m ... 06:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Cezanne (rev c5) ... -``` \ No newline at end of file +``` From 293b5e472b5d740bdc218de82c7a6b77955dd7ed Mon Sep 17 00:00:00 2001 From: Pasha Fistanto Date: Wed, 28 May 2025 20:19:16 +0200 Subject: [PATCH 2/2] dell-precision-3490: split into intel and nvidia configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- README.md | 3 ++- dell/precision/3490/default.nix | 29 +++++++++++--------------- dell/precision/3490/intel/default.nix | 5 +++++ dell/precision/3490/nvidia/default.nix | 12 +++++++++++ dell/precision/3490/shared.nix | 6 ++++++ flake.nix | 6 +++++- 6 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 dell/precision/3490/intel/default.nix create mode 100644 dell/precision/3490/nvidia/default.nix create mode 100644 dell/precision/3490/shared.nix 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;