mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-08 19:46:10 +01:00
Merge remote-tracking branch 'upstream/master' into nixfmt
This commit is contained in:
commit
511ea8f1e9
7 changed files with 42 additions and 22 deletions
|
|
@ -143,7 +143,8 @@ See code for all available configurations.
|
||||||
| [Dell Latitude E7240](dell/latitude/e7240) | `<nixos-hardware/dell/latitude/e7240>` |
|
| [Dell Latitude E7240](dell/latitude/e7240) | `<nixos-hardware/dell/latitude/e7240>` |
|
||||||
| [Dell Optiplex 3050](dell/optiplex/3050) | `<nixos-hardware/dell/optiplex/3050>` |
|
| [Dell Optiplex 3050](dell/optiplex/3050) | `<nixos-hardware/dell/optiplex/3050>` |
|
||||||
| [Dell Poweredge R7515](dell/poweredge/r7515) | `<nixos-hardware/dell/poweredge/r7515>` |
|
| [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 3541](dell/precision/3541) | `<nixos-hardware/dell/precision/3541>` |
|
||||||
| [Dell Precision 5490](dell/precision/5490) | `<nixos-hardware/dell/precision/5490>` |
|
| [Dell Precision 5490](dell/precision/5490) | `<nixos-hardware/dell/precision/5490>` |
|
||||||
| [Dell Precision 5530](dell/precision/5530) | `<nixos-hardware/dell/precision/5530>` |
|
| [Dell Precision 5530](dell/precision/5530) | `<nixos-hardware/dell/precision/5530>` |
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,16 @@
|
||||||
{
|
{
|
||||||
|
warnings = [
|
||||||
|
''
|
||||||
|
DEPRECATED: The <nixos-hardware/dell/precision/3490> module has been deprecated.
|
||||||
|
|
||||||
|
Either use
|
||||||
|
<nixos-hardware/dell/precision/3490/nvidia>
|
||||||
|
for NVIDIA graphics or
|
||||||
|
<nixos-hardware/dell/precision/3490/intel>
|
||||||
|
for Intel graphics.
|
||||||
|
''
|
||||||
|
];
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel/meteor-lake
|
./nvidia/default.nix
|
||||||
../../../common/gpu/nvidia/ada-lovelace
|
|
||||||
../../../common/pc/laptop
|
|
||||||
];
|
];
|
||||||
|
|
||||||
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";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
5
dell/precision/3490/intel/default.nix
Normal file
5
dell/precision/3490/intel/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../shared.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
11
dell/precision/3490/nvidia/default.nix
Normal file
11
dell/precision/3490/nvidia/default.nix
Normal file
|
|
@ -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";
|
||||||
|
};
|
||||||
|
}
|
||||||
6
dell/precision/3490/shared.nix
Normal file
6
dell/precision/3490/shared.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../../../common/cpu/intel/meteor-lake
|
||||||
|
../../../common/pc/laptop
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
@ -109,7 +109,9 @@
|
||||||
dell-latitude-e7240 = import ./dell/latitude/e7240;
|
dell-latitude-e7240 = import ./dell/latitude/e7240;
|
||||||
dell-optiplex-3050 = import ./dell/optiplex/3050;
|
dell-optiplex-3050 = import ./dell/optiplex/3050;
|
||||||
dell-poweredge-r7515 = import ./dell/poweredge/r7515;
|
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-3541 = import ./dell/precision/3541;
|
||||||
dell-precision-5490 = import ./dell/precision/5490;
|
dell-precision-5490 = import ./dell/precision/5490;
|
||||||
dell-precision-5530 = import ./dell/precision/5530;
|
dell-precision-5530 = import ./dell/precision/5530;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
## Introduction
|
## 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.**
|
**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
|
## Using multiple drives with this configuration
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue