mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-12-23 10:09:44 +01:00
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:
parent
0116223524
commit
356ebeaaf7
6 changed files with 12 additions and 9 deletions
6
lenovo/thinkpad/general-intel.nix
Normal file
6
lenovo/thinkpad/general-intel.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
boot.kernelModules = mkDefault [ "kvm-intel" ];
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./general.nix ];
|
||||
imports = [ ./general-intel.nix ];
|
||||
|
||||
boot = {
|
||||
kernelParams = [
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./general.nix ];
|
||||
imports = [ ./general-intel.nix ];
|
||||
|
||||
boot = {
|
||||
extraModprobeConfig = ''
|
||||
options bbswitch use_acpi_to_detect_card_state=1
|
||||
'';
|
||||
kernelModules = [ "kvm-intel" "tpm-rng" ];
|
||||
kernelModules = [ "tpm-rng" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports =
|
||||
[ ../lib/kernel-version.nix
|
||||
./general.nix
|
||||
./general-intel.nix
|
||||
];
|
||||
|
||||
## BEGIN from generated hardware-configuration
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./general.nix ];
|
||||
imports = [ ./general-intel.nix ];
|
||||
|
||||
# TPM chip countains a RNG
|
||||
security.rngd.enable = true;
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./general.nix ];
|
||||
|
||||
# modesetting driver leads to freezes with newer kernel at the moment (> 4.4)
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
imports = [ ./general-intel.nix ];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue