Merge branch 'master' into asus-fx506hm

NixOS · May 26, 2024 · b65b6de · b65b6de
2 parents cdf433f + 888d915
commit b65b6de
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v26
+    - uses: cachix/install-nix-action@V27
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: Show nixpkgs version

diff --git a/README.md b/README.md
@@ -165,6 +165,7 @@ See code for all available configurations.
 | [HP Elitebook 845g8](hp/elitebook/845/g8)                              | `<nixos-hardware/hp/elitebook/845/g8>`                  |
 | [HP Elitebook 845g9](hp/elitebook/845/g9)                              | `<nixos-hardware/hp/elitebook/845/g9>`                  |
 | [HP Notebook 14-df0023](hp/notebook/14-df0023)                         | `<nixos-hardware/hp/notebook/14-df0023>`                |
+| [Huawei Matebook X Pro (2020)](huawei/machc-wa)                        | `<nixos-hardware/huawei/machc-wa>`                      |
 | [i.MX8QuadMax Multisensory Enablement Kit](nxp/imx8qm-mek/)            | `<nixos-hardware/nxp/imx8qm-mek>`                       |
 | [Intel NUC 8i7BEH](intel/nuc/8i7beh/)                                  | `<nixos-hardware/intel/nuc/8i7beh>`                     |
 | [Lenovo IdeaPad Gaming 3 15arh05](lenovo/ideapad/15arh05)              | `<nixos-hardware/lenovo/ideapad/15arh05>`               |

diff --git a/flake.nix b/flake.nix
@@ -97,6 +97,7 @@
       hp-elitebook-845g7 = import ./hp/elitebook/845/g7;
       hp-elitebook-845g8 = import ./hp/elitebook/845/g8;
       hp-elitebook-845g9 = import ./hp/elitebook/845/g9;
+      huawei-machc-wa = import ./huawei/machc-wa;
       hp-notebook-14-df0023 = import ./hp/notebook/14-df0023;
       intel-nuc-8i7beh = import ./intel/nuc/8i7beh;
       lenovo-ideapad-15arh05 = import ./lenovo/ideapad/15arh05;

diff --git a/framework/16-inch/common/default.nix b/framework/16-inch/common/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
+    ../../kmod.nix
     ../../framework-tool.nix
   ];
 

diff --git a/huawei/machc-wa/README.md b/huawei/machc-wa/README.md
@@ -0,0 +1,3 @@
+# Huawei Matebook X Pro (2020)
+
+This is a very standard device that needs little configuration. The module mainly imports the common modules for its CPU, GPU, SSD etc. and enables ppd for power management. Nvidia prime offload is also enabled. This configuration should work with all Matebook X Pro models from 2020 (MACHC-WA*) other than MACHC-WAH9L as it does not contain the Nvidia GPU.
diff --git a/huawei/machc-wa/default.nix b/huawei/machc-wa/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  imports = [
+    ../../common/cpu/intel
+    ../../common/cpu/intel/comet-lake
+    ../../common/gpu/nvidia
+    ../../common/gpu/nvidia/prime.nix
+    ../../common/hidpi.nix
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+
+  hardware.nvidia = {
+    modesetting.enable = lib.mkDefault true;
+    open = lib.mkDefault false;
+    nvidiaSettings = lib.mkDefault true;
+    prime = {
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+
+  services.power-profiles-daemon.enable = lib.mkDefault true;
+}
diff --git a/lenovo/legion/16arha7/README.md b/lenovo/legion/16arha7/README.md
@@ -1,6 +1,6 @@
 ## Introduction
 
-This configuration includes a fix to get audio playing over the speakers, however, the volume is low. If you know of a workaround or fix, please contribute it to the repo!!
+This configuration includes a fix to get the speakers working on kernels earlier than 6.9.0. Kernels after 6.9.0 already have this patch built-in.
 
 ## Setup at the time of testing
 ```

diff --git a/lenovo/legion/16arha7/default.nix b/lenovo/legion/16arha7/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   lenovo-speaker-fix = pkgs.callPackage ./audio/lenovo-16ARHA7_speaker-fix.nix {
@@ -14,7 +14,8 @@ in
     ../../../common/pc/laptop/ssd
   ];
 
-  boot.extraModulePackages = [ lenovo-speaker-fix ];
+  # Kernel 6.9 includes the speaker fix, so only install this on systems with older kernels.
+  boot.extraModulePackages = lib.mkIf (!(lib.versionOlder config.boot.kernelPackages.kernel.version "6.9")) [ lenovo-speaker-fix ];
 
   # √(2560² + 1600²) px / 16 in ≃ 189 dpi
   services.xserver.dpi = 189;