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

This commit is contained in:
Andre 2025-06-07 11:30:37 -04:00
commit 511ea8f1e9
7 changed files with 42 additions and 22 deletions

View file

@ -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 = [
../../../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";
};
}

View file

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

View 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";
};
}

View file

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