diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-27 02:57:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-27 03:02:31 +0000 |
| commit | ab630003f4951542d7f246f25c11a19dc718bb64 (patch) | |
| tree | f62eee9a6e91ad9d6ce6a62d68facd23c3c36dbe /modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen | |
| parent | 7eb57d645ab60d8e61911c1aebc221cc2b9d98f8 (diff) | |
| parent | 115770eed0c0fa50c1277cd0f7fe0f15501dbc43 (diff) | |
| download | nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.gz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.bz2 nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.lz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.xz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.zst nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.zip | |
modules/nixos-hardware: merge 115770eed0c
Diffstat (limited to 'modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen')
| -rw-r--r-- | modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/audio.nix | 15 | ||||
| -rw-r--r-- | modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/default.nix | 7 |
2 files changed, 22 insertions, 0 deletions
diff --git a/modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/audio.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/audio.nix new file mode 100644 index 000000000000..f6ecf58aa337 --- /dev/null +++ b/modules/nixos-hardware/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_latest); + + # 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/modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/default.nix b/modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/default.nix new file mode 100644 index 000000000000..8349d05678a2 --- /dev/null +++ b/modules/nixos-hardware/lenovo/thinkpad/x1/7th-gen/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ../. + ../../../../common/pc/laptop/acpi_call.nix + ./audio.nix + ]; +} |