Skip to content

Commit 2336c83

Browse files
committed
Test dell
Signed-off-by: Yuri Nesterov <yuriy.nesterov@unikie.com>
1 parent 4f6a0d3 commit 2336c83

File tree

2 files changed

+32
-11
lines changed

2 files changed

+32
-11
lines changed

modules/reference/hardware/flake-module.nix

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,28 @@
77
{
88
# keep-sorted start skip_lines=1 block=yes newline_separated=yes by_regex=\s*nixosModules\.(.*)$ prefix_order=hardware-x86_64-workstation,jetpack
99
flake.nixosModules = {
10+
hardware-dell-latitude-7330.imports = [
11+
inputs.self.nixosModules.hardware-x86_64-workstation
12+
#{
13+
#ghaf.hardware.definition = import ./dell-latitude/definitions/dell-latitude-7330.nix;
14+
#}
15+
{
16+
ghaf.hardware.definition = import ./intel-laptop/intel-laptop.nix;
17+
ghaf.hardware.passthrough = {
18+
pci.autoDetectGpu = true;
19+
pci.autoDetectNet = true;
20+
pci.autoDetectAudio = true;
21+
pciAcsOverride = {
22+
enable = true;
23+
ids = [
24+
"8086:15fb" # Intel Corporation Ethernet Connection (13) I219-LM (dell-latitude-7330)
25+
"8086:550a" # Intel Corporation Ethernet Connection (18) I219-LM (system76-darp11-b)
26+
];
27+
};
28+
};
29+
}
30+
];
31+
1032
hardware-alienware-m18-r2.imports = [
1133
inputs.self.nixosModules.hardware-x86_64-workstation
1234
{
@@ -27,13 +49,6 @@
2749
}
2850
];
2951

30-
hardware-dell-latitude-7330.imports = [
31-
inputs.self.nixosModules.hardware-x86_64-workstation
32-
{
33-
ghaf.hardware.definition = import ./dell-latitude/definitions/dell-latitude-7330.nix;
34-
}
35-
];
36-
3752
hardware-demo-tower-mk1.imports = [
3853
inputs.self.nixosModules.hardware-x86_64-workstation
3954
{

targets/laptop/flake-module.nix

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ let
8282

8383
# Enable PCI ACS override to split IOMMU groups
8484
# Needed to separate Ethernet (8086:15fb) from Audio devices
85-
hardware.passthrough.pciAcsOverride = {
86-
enable = true;
87-
ids = [ "8086:15fb" ]; # Ethernet controller at 00:1f.6
88-
};
85+
#hardware.passthrough.pciAcsOverride = {
86+
#enable = true;
87+
#ids = [ "8086:15fb" ]; # Ethernet controller at 00:1f.6
88+
#};
8989
virtualization.microvm.guivm.extraModules = [
9090
{
9191
microvm.mem = lib.mkForce 6144;
@@ -115,6 +115,12 @@ let
115115
ghaf = {
116116
reference.profiles.mvp-user-trial.enable = true;
117117
partitioning.disko.enable = true;
118+
virtualization.microvm.guivm.extraModules = [
119+
{
120+
microvm.mem = lib.mkForce 6144;
121+
}
122+
];
123+
virtualization.microvm.appvm.vms.flatpak.ramMb = lib.mkForce 5120;
118124
};
119125
}
120126
]))

0 commit comments

Comments
 (0)