Skip to content

Commit 511ea8f

Browse files
8bitbuddhist8bitbuddhist
committed
Merge remote-tracking branch 'upstream/master' into nixfmt
2 parents 2b0ced0 + 4602f7e commit 511ea8f

File tree

7 files changed

+42
-22
lines changed

7 files changed

+42
-22
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ See code for all available configurations.
143143
| [Dell Latitude E7240](dell/latitude/e7240) | `<nixos-hardware/dell/latitude/e7240>` |
144144
| [Dell Optiplex 3050](dell/optiplex/3050) | `<nixos-hardware/dell/optiplex/3050>` |
145145
| [Dell Poweredge R7515](dell/poweredge/r7515) | `<nixos-hardware/dell/poweredge/r7515>` |
146-
| [Dell Precision 3490](dell/precision/3490) | `<nixos-hardware/dell/precision/3490>` |
146+
| [Dell Precision 3490, nvidia](dell/precision/3490/nvidia) | `<nixos-hardware/dell/precision/3490/nvidia>` |
147+
| [Dell Precision 3490, intel](dell/precision/3490/intel) | `<nixos-hardware/dell/precision/3490/intel>` |
147148
| [Dell Precision 3541](dell/precision/3541) | `<nixos-hardware/dell/precision/3541>` |
148149
| [Dell Precision 5490](dell/precision/5490) | `<nixos-hardware/dell/precision/5490>` |
149150
| [Dell Precision 5530](dell/precision/5530) | `<nixos-hardware/dell/precision/5530>` |

‎dell/precision/3490/default.nix

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
{
2-
imports = [
3-
../../../common/cpu/intel/meteor-lake
4-
../../../common/gpu/nvidia/ada-lovelace
5-
../../../common/pc/laptop
6-
];
2+
warnings = [
3+
''
4+
DEPRECATED: The <nixos-hardware/dell/precision/3490> module has been deprecated.
75
8-
boot.initrd.availableKernelModules = [
9-
"nvme"
10-
"sd_mod"
11-
"thunderbolt"
12-
"usb_storage"
13-
"vmd"
14-
"xhci_pci"
6+
Either use
7+
<nixos-hardware/dell/precision/3490/nvidia>
8+
for NVIDIA graphics or
9+
<nixos-hardware/dell/precision/3490/intel>
10+
for Intel graphics.
11+
''
12+
];
13+
imports = [
14+
./nvidia/default.nix
1515
];
16-
17-
hardware.nvidia.prime = {
18-
intelBusId = "PCI:0:2:0";
19-
nvidiaBusId = "PCI:1:0:0";
20-
};
2116
}

‎dell/precision/3490/intel/default.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
imports = [
3+
../shared.nix
4+
];
5+
}

‎dell/precision/3490/nvidia/default.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
imports = [
3+
../shared.nix
4+
../../../../common/gpu/nvidia/ada-lovelace
5+
];
6+
7+
hardware.nvidia.prime = {
8+
intelBusId = "PCI:0:2:0";
9+
nvidiaBusId = "PCI:1:0:0";
10+
};
11+
}

‎dell/precision/3490/shared.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
imports = [
3+
../../../common/cpu/intel/meteor-lake
4+
../../../common/pc/laptop
5+
];
6+
}

‎flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@
109109
dell-latitude-e7240 = import ./dell/latitude/e7240;
110110
dell-optiplex-3050 = import ./dell/optiplex/3050;
111111
dell-poweredge-r7515 = import ./dell/poweredge/r7515;
112-
dell-precision-3490 = import ./dell/precision/3490;
112+
dell-precision-3490 = deprecated "1491" "dell-precision-3490" (import ./dell/precision/3490);
113+
dell-precision-3490-nvidia = import ./dell/precision/3490/nvidia;
114+
dell-precision-3490-intel = import ./dell/precision/3490/intel;
113115
dell-precision-3541 = import ./dell/precision/3541;
114116
dell-precision-5490 = import ./dell/precision/5490;
115117
dell-precision-5530 = import ./dell/precision/5530;

‎lenovo/legion/15ach6h/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Introduction
2-
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.
2+
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.
33
**But It will slow down NixOS evaluation by factor 2 and increase memory usage.**
4-
So if you don't need specialization feature, you can just use hybrid only configuration or nvidia only (DDG only) configuration
4+
So if you don't need specialization feature, you can just use hybrid only configuration or nvidia only (Dual-Direct-GFX-Mode only) configuration
55

66
## Using multiple drives with this configuration
77

@@ -27,4 +27,4 @@ $ nix-info -m
2727
...
2828
06:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Cezanne (rev c5)
2929
...
30-
```
30+
```

0 commit comments

Comments
 (0)