From 8c320bbc8a10879c788a2a2b53b0378f7cf7573d Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 16 May 2020 16:12:10 -0400 Subject: [PATCH] lenovo/thinkpad/x1/7th-gen: init --- README.md | 2 ++ lenovo/thinkpad/x1/7th-gen/audio.nix | 15 +++++++++++++++ lenovo/thinkpad/x1/7th-gen/default.nix | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 lenovo/thinkpad/x1/7th-gen/audio.nix create mode 100644 lenovo/thinkpad/x1/7th-gen/default.nix diff --git a/README.md b/README.md index bd5e119..f417be1 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ See code for all available configurations. | Lenovo ThinkPad X270 | `` | | Lenovo ThinkPad X280 | `` | | [Lenovo ThinkPad X1 (6th Gen)][] | `` | +| [Lenovo ThinkPad X1 (7th Gen)][] | `` | | Lenovo ThinkPad X1 Extreme Gen 2 | `` | | [Microsoft Surface Pro 3][] | `` | | PC Engines APU | `` | @@ -97,6 +98,7 @@ See code for all available configurations. [Google Pixelbook]: google/pixelbook [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen +[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen [Lenovo ThinkPad X260]: lenovo/thinkpad/x260 [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 diff --git a/lenovo/thinkpad/x1/7th-gen/audio.nix b/lenovo/thinkpad/x1/7th-gen/audio.nix new file mode 100644 index 0000000..02f0fdf --- /dev/null +++ b/lenovo/thinkpad/x1/7th-gen/audio.nix @@ -0,0 +1,15 @@ +{ lib, pkgs, ... }: +{ + # This can be removed when the default kernel is at least version 5.6 + # https://github.com/NixOS/nixpkgs/pull/86168 + boot.kernelPackages = lib.mkIf + (lib.versionOlder pkgs.linux.version "5.6") + (lib.mkDefault pkgs.linuxPackages_5_6); + + # This can be removed when PulseAudio is at least version 14 + # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_7)#Audio + hardware.pulseaudio.extraConfig = '' + load-module module-alsa-sink device=hw:0,0 channels=4 + load-module module-alsa-source device=hw:0,6 channels=4 + ''; +} diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/lenovo/thinkpad/x1/7th-gen/default.nix new file mode 100644 index 0000000..8349d05 --- /dev/null +++ b/lenovo/thinkpad/x1/7th-gen/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ../. + ../../../../common/pc/laptop/acpi_call.nix + ./audio.nix + ]; +}