Merge remote-tracking branch 'upstream/master' into nixfmt

Author: 8bitbuddhist

README.md

@@ -143,7 +143,8 @@ See code for all available configurations.
 | [Dell Latitude E7240](dell/latitude/e7240)                                        | `<nixos-hardware/dell/latitude/e7240>`                  |
 | [Dell Optiplex 3050](dell/optiplex/3050)                                          | `<nixos-hardware/dell/optiplex/3050>`                   |
 | [Dell Poweredge R7515](dell/poweredge/r7515)                                      | `<nixos-hardware/dell/poweredge/r7515>`                 |
-| [Dell Precision 3490](dell/precision/3490)                                        | `<nixos-hardware/dell/precision/3490>`                  |
+| [Dell Precision 3490, nvidia](dell/precision/3490/nvidia)                         | `<nixos-hardware/dell/precision/3490/nvidia>`           |
+| [Dell Precision 3490, intel](dell/precision/3490/intel)                           | `<nixos-hardware/dell/precision/3490/intel>`            |
 | [Dell Precision 3541](dell/precision/3541)                                        | `<nixos-hardware/dell/precision/3541>`                  |
 | [Dell Precision 5490](dell/precision/5490)                                        | `<nixos-hardware/dell/precision/5490>`                  |
 | [Dell Precision 5530](dell/precision/5530)                                        | `<nixos-hardware/dell/precision/5530>`                  |

dell/precision/3490/default.nix

@@ -1,21 +1,16 @@
 {
-  imports = [
-    ../../../common/cpu/intel/meteor-lake
-    ../../../common/gpu/nvidia/ada-lovelace
-    ../../../common/pc/laptop
-  ];
+  warnings = [
+    ''
+      DEPRECATED: The <nixos-hardware/dell/precision/3490> module has been deprecated.
 
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "sd_mod"
-    "thunderbolt"
-    "usb_storage"
-    "vmd"
-    "xhci_pci"
+      Either use
+        <nixos-hardware/dell/precision/3490/nvidia>
+      for NVIDIA graphics or
+        <nixos-hardware/dell/precision/3490/intel>
+      for Intel graphics.
+    ''
+  ];
+  imports = [
+    ./nvidia/default.nix
   ];
-
-  hardware.nvidia.prime = {
-    intelBusId = "PCI:0:2:0";
-    nvidiaBusId = "PCI:1:0:0";
-  };
 }

dell/precision/3490/intel/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../shared.nix
+  ];
+}

dell/precision/3490/nvidia/default.nix

@@ -0,0 +1,11 @@
+{
+  imports = [
+    ../shared.nix
+    ../../../../common/gpu/nvidia/ada-lovelace
+  ];
+
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}

dell/precision/3490/shared.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../../common/cpu/intel/meteor-lake
+    ../../../common/pc/laptop
+  ];
+}

flake.nix

@@ -109,7 +109,9 @@
           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;

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)
 ...
-```
+```