Merge branch 'NixOS:master' into master

NixOS · Sep 4, 2024 · 03a1efc · 03a1efc
2 parents d34b24a + 8581079
commit 03a1efc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -100,6 +100,7 @@ See code for all available configurations.
 | [Asus ROG Zephyrus G14 GA402X* (2023)](asus/zephyrus/ga402x/nvidia)    | `<nixos-hardware/asus/zephyrus/ga402x/nvidia>`          |
 | [Asus ROG Zephyrus G15 GA502](asus/zephyrus/ga502)                     | `<nixos-hardware/asus/zephyrus/ga502>`                  |
 | [Asus ROG Zephyrus G15 GA503](asus/zephyrus/ga503)                     | `<nixos-hardware/asus/zephyrus/ga503>`                  |
+| [Asus ROG Zephyrus G16 GU605MY](asus/zephyrus/gu605my)                 | `<nixos-hardware/asus/zephyrus/gu605my>`                |
 | [Asus ROG Zephyrus M16 GU603H](asus/zephyrus/gu603h)                   | `<nixos-hardware/asus/zephyrus/gu603h>`                 |
 | [Asus TUF FX504GD](asus/fx504gd)                                       | `<nixos-hardware/asus/fx504gd>`                         |
 | [Asus TUF FX506HM](asus/fx506hm)                                       | `<nixos-hardware/asus/fx506hm>`                         |

diff --git a/asus/zephyrus/gu605my/default.nix b/asus/zephyrus/gu605my/default.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+  ];
+
+  hardware.nvidia.prime = {
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
+  };
+}
diff --git a/flake.nix b/flake.nix
@@ -40,6 +40,7 @@
       asus-zephyrus-ga502 = import ./asus/zephyrus/ga502;
       asus-zephyrus-ga503 = import ./asus/zephyrus/ga503;
       asus-zephyrus-gu603h = import ./asus/zephyrus/gu603h;
+      asus-zephyrus-gu605my = import ./asus/zephyrus/gu605my;
       beagleboard-pocketbeagle = import ./beagleboard/pocketbeagle;
       chuwi-minibook-x = import ./chuwi/minibook-x;
       deciso-dec = import ./deciso/dec;

diff --git a/lenovo/legion/15arh05h/default.nix b/lenovo/legion/15arh05h/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ../../../common/cpu/amd
     ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
   ];