From 67cd7af6be9cc4ece9622e2f6db2f211ff261f0e Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sun, 24 Dec 2017 01:13:08 +0000
Subject: [PATCH] thinkpad: common.nix -> default.nix + fixup after intel.nix
 drop

---
 lenovo/thinkpad/{common.nix => default.nix} | 0
 lenovo/thinkpad/t410/default.nix            | 2 ++
 lenovo/thinkpad/t440p/default.nix           | 2 ++
 lenovo/thinkpad/t460s/default.nix           | 1 +
 lenovo/thinkpad/x140e/default.nix           | 2 +-
 lenovo/thinkpad/x220/default.nix            | 4 +++-
 6 files changed, 9 insertions(+), 2 deletions(-)
 rename lenovo/thinkpad/{common.nix => default.nix} (100%)

diff --git a/lenovo/thinkpad/common.nix b/lenovo/thinkpad/default.nix
similarity index 100%
rename from lenovo/thinkpad/common.nix
rename to lenovo/thinkpad/default.nix
diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix
index 6fe10b43984..3dbc4e596c3 100644
--- a/lenovo/thinkpad/t410/default.nix
+++ b/lenovo/thinkpad/t410/default.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  imports = [ ../. ];
+
   boot = {
     kernelParams = [
       "drm.debug=0"
diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix
index 2342f6da237..262638adba1 100644
--- a/lenovo/thinkpad/t440p/default.nix
+++ b/lenovo/thinkpad/t440p/default.nix
@@ -1,6 +1,8 @@
 { config, pkgs, ... }:
 
 {
+  imports = [ ../. ];
+
   boot = {
     extraModprobeConfig = ''
       options bbswitch use_acpi_to_detect_card_state=1
diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix
index aca2b40bcb1..3e51709bd2b 100644
--- a/lenovo/thinkpad/t460s/default.nix
+++ b/lenovo/thinkpad/t460s/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../.
     ../lib/kernel-version.nix
   ];
 
diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix
index a6fb02a9e88..38f34608a3d 100644
--- a/lenovo/thinkpad/x140e/default.nix
+++ b/lenovo/thinkpad/x140e/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../common.nix ];
+  imports = [ ../. ];
 
   boot = {
     # wireless
diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix
index 2a506d0d9b0..81fec064967 100644
--- a/lenovo/thinkpad/x220/default.nix
+++ b/lenovo/thinkpad/x220/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../intel.nix ];
+  imports = [ ../. ];
 
   # hard disk protection if the laptop falls
   services.hdapsd.enable = true;
@@ -11,4 +11,6 @@
   #security.pam.services.login.fprintAuth = true;
   #security.pam.services.xscreensaver.fprintAuth = true;
   # similarly for other PAM providers
+
+  services.xserver.videoDrivers = [ "intel" ];
 }