Merge pull request #27 from yegortimoshenko/20171222.023336/cleanup-thinkpad

thinkpad: cleanup
This commit is contained in:
zimbatm 2017-12-22 10:35:57 +00:00 committed by GitHub
commit 3f2fbacb21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 35 deletions

View file

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

View file

@ -1,5 +1,3 @@
{ ... }:
{
boot.kernelModules = mkDefault [ "kvm-intel" ];
services.xserver.videoDrivers = [ "intel" ];

View file

@ -1,22 +1,11 @@
{ pkgs, lib, ... }:
{ lib, pkgs, ... }:
with lib;
let
inherit (lib) mkDefault;
in
{
hardware.trackpoint = mkDefault {
enable = true;
emulateWheel = true;
};
hardware.enableRedistributableFirmware = mkDefault true;
services.tlp.enable = true;
services.xserver = mkDefault {
synaptics.enable = false;
libinput.enable = true;
};
environment.systemPackages = [ pkgs.acpi ];
sound.enableMediaKeys = mkDefault true;
hardware.trackpoint.enable = mkDefault true;
services.tlp.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true;
}

View file

@ -6,11 +6,22 @@
boot = {
kernelParams = [
# Kernel GPU Savings Options (NOTE i915 chipset only)
"drm.debug=0" "drm.vblankoffdelay=1" "i915.semaphores=1" "i915.modeset=1"
"i915.use_mmio_flip=1" "i915.powersave=1" "i915.enable_ips=1"
"i915.disable_power_well=1" "i915.enable_hangcheck=1"
"i915.enable_cmd_parser=1" "i915.fastboot=0" "i915.enable_ppgtt=1"
"i915.reset=0" "i915.lvds_use_ssc=0" "i915.enable_psr=0" "vblank_mode=0"
"drm.debug=0"
"drm.vblankoffdelay=1"
"i915.semaphores=1"
"i915.modeset=1"
"i915.use_mmio_flip=1"
"i915.powersave=1"
"i915.enable_ips=1"
"i915.disable_power_well=1"
"i915.enable_hangcheck=1"
"i915.enable_cmd_parser=1"
"i915.fastboot=0"
"i915.enable_ppgtt=1"
"i915.reset=0"
"i915.lvds_use_ssc=0"
"i915.enable_psr=0"
"vblank_mode=0"
"i915.i915_enable_rc6=1"
];
blacklistedKernelModules = [

View file

@ -1,8 +1,8 @@
{ config, pkgs, ... }:
{
imports =
[ ../lib/kernel-version.nix
imports = [
../lib/kernel-version.nix
./general-intel.nix
];

View file

@ -15,5 +15,5 @@
};
# video card
services.xserver.videoDrivers = ["ati"];
services.xserver.videoDrivers = [ "ati" ];
}

View file

@ -8,7 +8,7 @@
boot = {
kernelModules = [ "tp_smapi" ];
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ];
};
# hard disk protection if the laptop falls