about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-12-01 17:17:15 +0000
committerGitHub <noreply@github.com>2020-12-01 17:17:15 +0000
commit025c7a2a7efd9edf341879dbd46988d3a65a76dc (patch)
treefe4ad1859f164bddf5b47a6b816fc9c62b624e4a
parent6531786e2df736021c0fa375851bbb1afb3d0666 (diff)
parent060c89b69fca85185d296c497770eda4d45b1849 (diff)
downloadnixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar.gz
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar.bz2
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar.lz
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar.xz
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.tar.zst
nixlib-025c7a2a7efd9edf341879dbd46988d3a65a76dc.zip
Merge pull request #216 from erdnaxe/master
dell/g3/3779: init
-rw-r--r--README.md2
-rw-r--r--dell/g3/3779/default.nix24
-rw-r--r--flake.nix1
3 files changed, 27 insertions, 0 deletions
diff --git a/README.md b/README.md
index 0414cfe4643d..21243005c171 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,7 @@ See code for all available configurations.
 | Apple MacBook Pro 12,1            | `<nixos-hardware/apple/macbook-pro/12-1>`          |
 | Asus TUF FX504GD                  | `<nixos-hardware/asus/fx504gd>`                    |
 | BeagleBoard PocketBeagle          | `<nixos-hardware/beagleboard/pocketbeagle>`        |
+| [Dell G3 3779][]                  | `<nixos-hardware/dell/g3/3779>`                    |
 | Dell Latitude 3480                | `<nixos-hardware/dell/latitude/3480>`              |
 | Dell Precision 5530               | `<nixos-hardware/dell/precision/5530>`             |
 | [Dell XPS E7240][]                | `<nixos-hardware/dell/e7240>`                      |
@@ -139,6 +140,7 @@ See code for all available configurations.
 [Acer Aspire 4810T]: acer/aspire/4810t
 [Asus TUF FX504GD]: asus/fx504gd
 [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1
+[Dell G3 3779]: dell/g3/3779
 [Dell XPS E7240]: dell/e7240
 [Dell XPS 13 7390]: dell/xps/13-7390
 [Dell XPS 13 9343]: dell/xps/13-9343
diff --git a/dell/g3/3779/default.nix b/dell/g3/3779/default.nix
new file mode 100644
index 000000000000..8c9b3d328bd0
--- /dev/null
+++ b/dell/g3/3779/default.nix
@@ -0,0 +1,24 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia.nix
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
+  ];
+
+  # Specify bus id of Nvidia and Intel graphics
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+
+  # Cooling management
+  services.thermald.enable = lib.mkDefault true;
+
+  # Use same ACPI identifier as Dell Ubuntu
+  boot.kernelParams = [
+    "acpi_osi=Linux-Dell-Video"
+  ];
+}
diff --git a/flake.nix b/flake.nix
index 116920b8f07b..79326dacbd29 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
       apple-macbook-air-10-1 = import ./apple/macbook-pro/10-1;
       apple-macbook-air-12-1 = import ./apple/macbook-pro/12-1;
       beagleboard-pocketbeagle = import ./beagleboard/pocketbeagle;
+      dell-g3-3779 = import ./dell/g3/3779;
       dell-latitude-3480 = import ./dell/latitude/3480;
       dell-precision-5530 = import ./dell/precision/5530;
       dell-e7240 = import ./dell/e7240;