aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

thinkpad: drop intel.nix, explicit services.xserver.videoDrivers

Browse source 
Kernel modules are already generated with nixos-generate-config.
This commit is contained in:
Yegor Timoshenko 2017-12-22 17:49:09 +00:00
parent 1bb5593772
commit 0c17d72838
No known key found for this signature in database
GPG key ID: C34BF9DCC9DF8210
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lenovo/thinkpad/intel.nix
View file

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

3
lenovo/thinkpad/t410/default.nix
View file

@ -1,8 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../intel.nix ];
boot = { boot = {
kernelParams = [ kernelParams = [
"drm.debug=0" "drm.debug=0"
@ -86,4 +84,5 @@
# ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true # ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true
}; };
services.xserver.videoDrivers = [ "intel" ];
} }

4
lenovo/thinkpad/t440p/default.nix
View file

@ -1,12 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../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 = [ "tpm-rng" ]; kernelModules = [ "tpm-rng" ];
}; };
services.xserver.videoDrivers = [ "intel" ];
} }

3
lenovo/thinkpad/t460s/default.nix
View file

@ -3,7 +3,6 @@
{ {
imports = [ imports = [
../lib/kernel-version.nix ../lib/kernel-version.nix
./general-intel.nix
]; ];
# Use the gummiboot efi boot loader. (From default generated configuration.nix) # Use the gummiboot efi boot loader. (From default generated configuration.nix)
@ -26,4 +25,6 @@
# Aspect Ratio: 16 × 9 (1.78:1) # Aspect Ratio: 16 × 9 (1.78:1)
# Pixel Count: 3,686,400 # Pixel Count: 3,686,400
# Megapixels: 3.69MP # Megapixels: 3.69MP
services.xserver.videoDrivers = [ "intel" ];
} }