eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-27 05:19:43 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into add-e7240

Browse source
This commit is contained in:
Jörg Thalheim 2019-10-09 15:12:00 +01:00 committed by GitHub
commit 05e63ee072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 97 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -24,10 +24,8 @@ imports = [
See code for all available configurations. See code for all available configurations.
| Model | Path | | Model | Path |
| --------------------------------- | -------------------------------------------- | | --------------------------------- | -------------------------------------------------- |
| [Acer Aspire 4810T][] | `<nixos-hardware/acer/aspire/4810t>` | | [Acer Aspire 4810T][] | `<nixos-hardware/acer/aspire/4810t>` |
| Airis N990 | `<nixos-hardware/airis/n990>` | | Airis N990 | `<nixos-hardware/airis/n990>` |
| Apple MacBook Air 4,X | `<nixos-hardware/apple/macbook-air/4>` | | Apple MacBook Air 4,X | `<nixos-hardware/apple/macbook-air/4>` |
@ -58,6 +56,7 @@ See code for all available configurations.
| [Lenovo ThinkPad X260][] | `<nixos-hardware/lenovo/thinkpad/x260>` | | [Lenovo ThinkPad X260][] | `<nixos-hardware/lenovo/thinkpad/x260>` |
| Lenovo ThinkPad X270 | `<nixos-hardware/lenovo/thinkpad/x270>` | | Lenovo ThinkPad X270 | `<nixos-hardware/lenovo/thinkpad/x270>` |
| [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 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>` |
| [Raspberry Pi 2][] | `<nixos-hardware/raspberry-pi/2>` | | [Raspberry Pi 2][] | `<nixos-hardware/raspberry-pi/2>` |

2
lenovo/thinkpad/t490/default.nix
View file

@ -22,7 +22,7 @@
KERNEL!="card*", GOTO="pulseaudio_end" KERNEL!="card*", GOTO="pulseaudio_end"
# Lenovo T490 # Lenovo T490
ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}" ATTRS{vendor}=="0x8086" ATTRS{device}=="0x9dc8" ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}"
LABEL="pulseaudio_end" LABEL="pulseaudio_end"
''; '';

8
lenovo/thinkpad/x1-extreme/default.nix Normal file
View file

@ -0,0 +1,8 @@
{
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];
}

47
lenovo/thinkpad/x1-extreme/gen2/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ config, lib, ... }:
with lib;
{
imports = [
../.
../../../../common/pc/laptop/cpu-throttling-bug.nix
];
# Fixes an issue with incorrect battery reporting. See
# https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Extreme_(Gen_2)#Invalid_Stats_Workaround
boot.initrd.availableKernelModules = [ "battery" ];
# New ThinkPads have a different TrackPoint manufacturer/name.
# See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/
hardware.trackpoint.device = "TPPS/2 Elan TrackPoint";
# Since the HDMI port is connected to the NVIDIA card.
hardware.bumblebee.connectDisplay = true;
nixpkgs.overlays = [
(self: super: {
bumblebee = super.bumblebee.override {
extraNvidiaDeviceOptions = ''
Option "AllowEmptyInitialConfiguration"
'';
};
})
];
services.xserver = mkMerge [
{
# Set the right DPI. xdpyinfo says the screen is 508×285 mm but
# it actually is 344×193 mm.
monitorSection = ''
DisplaySize 344 193
'';
}
# To support intel-virtual-output when using Bumblebee.
(mkIf config.hardware.bumblebee.enable {
deviceSection = ''Option "VirtualHeads" "1"'';
videoDrivers = [ "intel" ];
})
];
}