thinkpad: common.nix -> default.nix + fixup after intel.nix drop

6 files changed, 9 insertions, 2 deletions

diff --git a/lenovo/thinkpad/common.nix b/lenovo/thinkpad/default.nix
index e51a575..e51a575 100644
--- a/lenovo/thinkpad/common.nix
+++ b/lenovo/thinkpad/default.nix
diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix
index 6fe10b4..3dbc4e5 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 2342f6d..262638a 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 aca2b40..3e51709 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 a6fb02a..38f3460 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 2a506d0..81fec06 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" ];
 }