Introduce general-intel.nix for defaults with Intel CPU

The x1xx series relies on a AMD CPU, but all other (currently supported)
ThinkPads use an Intel CPU, so `general-intel.nix` is responsible
for all Intel defaults.
This commit is contained in:
Maximilian Bosch 2017-09-06 10:01:01 +02:00
parent 0116223524
commit 356ebeaaf7
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
6 changed files with 12 additions and 9 deletions

View file

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

View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./general.nix ]; imports = [ ./general-intel.nix ];
boot = { boot = {
kernelParams = [ kernelParams = [

View file

@ -1,12 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./general.nix ]; imports = [ ./general-intel.nix ];
boot = { boot = {
extraModprobeConfig = '' extraModprobeConfig = ''
options bbswitch use_acpi_to_detect_card_state=1 options bbswitch use_acpi_to_detect_card_state=1
''; '';
kernelModules = [ "kvm-intel" "tpm-rng" ]; kernelModules = [ "tpm-rng" ];
}; };
} }

View file

@ -3,7 +3,7 @@
{ {
imports = imports =
[ ../lib/kernel-version.nix [ ../lib/kernel-version.nix
./general.nix ./general-intel.nix
]; ];
## BEGIN from generated hardware-configuration ## BEGIN from generated hardware-configuration

View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ./general.nix ]; imports = [ ./general-intel.nix ];
# TPM chip countains a RNG # TPM chip countains a RNG
security.rngd.enable = true; security.rngd.enable = true;

View file

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