2019-09-28 17:58:20 -04:00
|
|
|
|
{ config, lib, ... }:
|
|
|
|
|
|
|
|
|
|
|
|
with lib;
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
imports = [
|
|
|
|
|
|
../.
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
|
|
# 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 = [
|
2022-12-31 05:52:38 -05:00
|
|
|
|
(_self: super: {
|
2019-09-28 17:58:20 -04:00
|
|
|
|
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" ];
|
|
|
|
|
|
})
|
|
|
|
|
|
];
|
2019-07-19 06:03:36 -04:00
|
|
|
|
|
|
|
|
|
|
services.throttled.enable = lib.mkDefault true;
|
2019-09-28 17:58:20 -04:00
|
|
|
|
}
|
