Skip to content

Commit 293b5e4

Browse files
s1syph0sMic92
andcommitted
dell-precision-3490: split into intel and nvidia configurations
Co-authored-by: Jörg Thalheim <[email protected]>
1 parent 11f2d9e commit 293b5e4

File tree

6 files changed

+42
-19
lines changed

6 files changed

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

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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@
8383
dell-latitude-e7240 = import ./dell/latitude/e7240;
8484
dell-optiplex-3050 = import ./dell/optiplex/3050;
8585
dell-poweredge-r7515 = import ./dell/poweredge/r7515;
86-
dell-precision-3490 = import ./dell/precision/3490;
86+
dell-precision-3490 =
87+
deprecated "1491" "dell-precision-3490"
88+
(import ./dell/precision/3490);
89+
dell-precision-3490-nvidia = import ./dell/precision/3490/nvidia;
90+
dell-precision-3490-intel = import ./dell/precision/3490/intel;
8791
dell-precision-3541 = import ./dell/precision/3541;
8892
dell-precision-5490 = import ./dell/precision/5490;
8993
dell-precision-5530 = import ./dell/precision/5530;

0 commit comments

Comments
 (0)