From e7cb2b9a63d7b1d6a699628ec23bf7cc9b290e58 Mon Sep 17 00:00:00 2001 From: Mic92 <96200+Mic92@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:23:06 +0000 Subject: [PATCH] msigl65: add initial configuration (#1106) lenovo: fix unstable wifi on Yoga laptops Add extra modprobe options to fix unstable wifi on Yoga laptops. * Merge branch 'NixOS:master' into master * Add basic GPD Mini configuration. * Merge branch 'NixOS:master' into master * msi: add support for MSI GL65 10SDR-492 * Switch to mkDefault for enabling options. * Merge branch 'msigl65' msi/gl65/10SDR-492: add initial configuration * Update paths for common configs. * Merge branch 'NixOS:master' into master --- README.md | 3 ++- flake.nix | 1 + msi/gl65/10SDR-492/default.nix | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 msi/gl65/10SDR-492/default.nix diff --git a/README.md b/README.md index bf6290d6d..b7ede8343 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,7 @@ See code for all available configurations. | [MSI B350 TOMAHAWK](msi/b350-tomahawk) | `` | | [MSI GS60 2QE](msi/gs60) | `` | | [MSI GL62/CX62](msi/gl62) | `` | +| [MSI GL65 10SDR-492](msi/gl65/10SDR-492) | `` | | [Microchip Icicle Kit](microchip/icicle-kit) | `` | | [Microsoft Surface Go](microsoft/surface/surface-go) | `` | | [Microsoft Surface Pro (Intel)](microsoft/surface/surface-pro-intel) | `` | @@ -325,7 +326,7 @@ See code for all available configurations. | [Supermicro X12SCZ-TLN4F](supermicro/x12scz-tln4f) | `` | | [System76 (generic)](system76) | `` | | [System76 Darter Pro 6](system76/darp6) | `` | -| [System76 Gazelle Gaze18](system76/gaze18) | `` | +| [System76 Gazelle Gaze18](system76/gaze18) | `` | | [Toshiba Chromebook 2 `swanky`](toshiba/swanky) | `` | | [Tuxedo InfinityBook v4](tuxedo/infinitybook/v4) | `` | | [TUXEDO InfinityBook Pro 14 - Gen7](tuxedo/infinitybook/pro14/gen7) | `` | diff --git a/flake.nix b/flake.nix index 4d1ebf2ce..0cf0687c4 100644 --- a/flake.nix +++ b/flake.nix @@ -236,6 +236,7 @@ msi-b550-a-pro = import ./msi/b550-a-pro; msi-gs60 = import ./msi/gs60; msi-gl62 = import ./msi/gl62; + msi-gl65-10SDR-492 = import ./msi/gl65/10SDR-492; nxp-imx8mp-evk = import ./nxp/imx8mp-evk; nxp-imx8mq-evk = import ./nxp/imx8mq-evk; nxp-imx8qm-mek = import ./nxp/imx8qm-mek; diff --git a/msi/gl65/10SDR-492/default.nix b/msi/gl65/10SDR-492/default.nix new file mode 100644 index 000000000..3e825d4bd --- /dev/null +++ b/msi/gl65/10SDR-492/default.nix @@ -0,0 +1,26 @@ +{ lib, ... }: + +{ + imports = [ + ../../../common/pc/laptop/ssd + ../../../common/cpu/intel + ../../../common/gpu/intel/comet-lake + ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/turing + ../../../common/pc/laptop + ]; + + hardware.bluetooth.enable = lib.mkDefault true; + + hardware.graphics.enable = lib.mkDefault true; + + hardware.nvidia = { + prime = { + # Bus ID of the Intel GPU. + intelBusId = lib.mkDefault "PCI:0:2:0"; + + # Bus ID of the NVIDIA GPU. + nvidiaBusId = lib.mkDefault "PCI:1:0:0"; + }; + }; +}