Initialize general.nix; merge defaults into all ThinkPad configurations

This commit is contained in:
Maximilian Bosch 2017-09-03 23:25:33 +02:00
parent ecbb9c15c3
commit ae18b6af0f
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
8 changed files with 24 additions and 21 deletions

10
lenovo/general.nix Normal file
View file

@ -0,0 +1,10 @@
{ lib, ... }:
with lib;
{
hardware.trackpoint = mkDefault {
enable = true;
emulateWheel = true;
};
}

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
imports = [ ./general.nix ];
boot = {
kernelParams = [
# Kernel GPU Savings Options (NOTE i915 chipset only)

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
imports = [ ./general.nix ];
boot = {
extraModprobeConfig = ''
options bbswitch use_acpi_to_detect_card_state=1

View file

@ -3,6 +3,7 @@
{
imports =
[ ../lib/kernel-version.nix
./general.nix
];
## BEGIN from generated hardware-configuration
@ -45,15 +46,5 @@
services.xserver = {
libinput.enable = true;
synaptics.enable = false;
config = ''
Section "InputClass"
Identifier "Enable libinput for TrackPoint"
MatchIsPointer "on"
Driver "libinput"
Option "ScrollMethod" "button"
Option "ScrollButton" "8"
EndSection
'';
};
}

View file

@ -1,6 +1,8 @@
{ config, lib, pkgs, ... }:
{
imports = [ ./general.nix ];
boot = {
# wireless
kernelModules = [ "kvm-amd" "wl" ];
@ -15,12 +17,6 @@
# video card
services.xserver.videoDrivers = ["ati"];
# trackpad (touchpad disabled)
hardware.trackpoint = {
enable = true;
emulateWheel = true;
};
# media keys
sound.enableMediaKeys = true;
}

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
imports = [ ./general.nix ];
# TPM chip countains a RNG
security.rngd.enable = true;
@ -15,10 +17,6 @@
# hard disk protection if the laptop falls
services.hdapsd.enable = true;
# trackpoint support (touchpad disabled in this config)
hardware.trackpoint.enable = true;
hardware.trackpoint.emulateWheel = true;
# alternatively, touchpad with two-finger scrolling
#services.xserver.libinput.enable = true;

View file

@ -1,9 +1,10 @@
{ config, pkgs, ... }:
{
imports = [ ./general.nix ];
# modesetting driver leads to freezes with newer kernel at the moment (> 4.4)
services.xserver.videoDrivers = [ "intel" ];
services.xserver.libinput.enable = true;
hardware.trackpoint.emulateWheel = true;
}

View file

@ -1,3 +1,6 @@
# NOTE: this doesn't inherit from the `general.nix`
# as z510 is not a ThinkPad
{ config, pkgs, ... }:
{
hardware.cpu.intel.updateMicrocode = true;