aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #164 from phunehehe/x1

Browse source
This commit is contained in:
Jörg Thalheim 2020-05-17 15:59:34 +01:00 committed by GitHub
parent 718eaeed75 8c320bbc8a
commit eae378658f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -70,6 +70,7 @@ See code for all available configurations.
| Lenovo ThinkPad X270 | `<nixos-hardware/lenovo/thinkpad/x270>` | | Lenovo ThinkPad X270 | `<nixos-hardware/lenovo/thinkpad/x270>` |
| Lenovo ThinkPad X280 | `<nixos-hardware/lenovo/thinkpad/x280>` | | Lenovo ThinkPad X280 | `<nixos-hardware/lenovo/thinkpad/x280>` |
| [Lenovo ThinkPad X1 (6th Gen)][] | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>` | | [Lenovo ThinkPad X1 (6th Gen)][] | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>` |
| [Lenovo ThinkPad X1 (7th Gen)][] | `<nixos-hardware/lenovo/thinkpad/x1/7th-gen>` |
| Lenovo ThinkPad X1 Extreme Gen 2 | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>` | | Lenovo ThinkPad X1 Extreme Gen 2 | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>` |
| [Microsoft Surface Pro 3][] | `<nixos-hardware/microsoft/surface-pro/3>` | | [Microsoft Surface Pro 3][] | `<nixos-hardware/microsoft/surface-pro/3>` |
| PC Engines APU | `<nixos-hardware/pcengines/apu>` | | PC Engines APU | `<nixos-hardware/pcengines/apu>` |
@ -97,6 +98,7 @@ See code for all available configurations.
[Google Pixelbook]: google/pixelbook [Google Pixelbook]: google/pixelbook
[Inverse Path USB armory]: inversepath/usbarmory [Inverse Path USB armory]: inversepath/usbarmory
[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen [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 [Lenovo ThinkPad X260]: lenovo/thinkpad/x260
[Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Microsoft Surface Pro 3]: microsoft/surface-pro/3
[Raspberry Pi 2]: raspberry-pi/2 [Raspberry Pi 2]: raspberry-pi/2

15
lenovo/thinkpad/x1/7th-gen/audio.nix Normal file
View file

@ -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
'';
}

7
lenovo/thinkpad/x1/7th-gen/default.nix Normal file
View file

@ -0,0 +1,7 @@
{
imports = [
../.
../../../../common/pc/laptop/acpi_call.nix
./audio.nix
];
}