diff options
author | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-22 17:49:09 +0000 |
---|---|---|
committer | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-24 01:05:12 +0000 |
commit | 0c17d72838e5994a60ec06e42223a6449ee741b8 (patch) | |
tree | c4c88036fdfd950a1ea7cec23ddc5db30496e032 /lenovo | |
parent | 1bb559377262403fbe35e05072bd9807a9ce38f7 (diff) |
thinkpad: drop intel.nix, explicit services.xserver.videoDrivers
Kernel modules are already generated with nixos-generate-config.
Diffstat (limited to 'lenovo')
-rw-r--r-- | lenovo/thinkpad/intel.nix | 4 | ||||
-rw-r--r-- | lenovo/thinkpad/t410/default.nix | 3 | ||||
-rw-r--r-- | lenovo/thinkpad/t440p/default.nix | 4 | ||||
-rw-r--r-- | lenovo/thinkpad/t460s/default.nix | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/lenovo/thinkpad/intel.nix b/lenovo/thinkpad/intel.nix deleted file mode 100644 index 32d9594..0000000 --- a/lenovo/thinkpad/intel.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - boot.kernelModules = [ "kvm-intel" ]; - services.xserver.videoDrivers = [ "intel" ]; -} diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 581d901..6fe10b4 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { - imports = [ ../intel.nix ]; - boot = { kernelParams = [ "drm.debug=0" @@ -86,4 +84,5 @@ # ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true }; + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 5c8699d..2342f6d 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { - imports = [ ../intel.nix ]; - boot = { extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 ''; kernelModules = [ "tpm-rng" ]; }; + + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 4255ddd..aca2b40 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -3,7 +3,6 @@ { imports = [ ../lib/kernel-version.nix - ./general-intel.nix ]; # Use the gummiboot efi boot loader. (From default generated configuration.nix) @@ -26,4 +25,6 @@ # Aspect Ratio: 16 × 9 (1.78:1) # Pixel Count: 3,686,400 # Megapixels: 3.69MP + + services.xserver.videoDrivers = [ "intel" ]; } |