treewide: abstract away common configs into common/

lenovo/thinkpad/default.nix

@@ -1,9 +1,10 @@
 { lib, pkgs, ... }:
 
 {
+  imports = [ ../../common/pc/laptop ];
+
   hardware.trackpoint.enable = lib.mkDefault true;
-  services.tlp.enable = lib.mkDefault true;
-  services.xserver.libinput.enable = lib.mkDefault true;
+  services.thinkfan.enable = lib.mkDefault true;
 
   # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`)
   # services.fprintd.enable = true;

lenovo/thinkpad/t410/default.nix

@@ -1,7 +1,11 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../. ../tp-smapi.nix ];
+  imports = [
+    ../.
+    ../tp-smapi.nix
+    ../../../common/cpu/intel
+  ];
 
   boot = {
     kernelParams = [
@@ -27,8 +31,4 @@
       "sierra_net" "cdc_mbim" "cdc_ncm" "btusb"
     ];
   };
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault true;
-
-  services.xserver.videoDrivers = [ "intel" ];
 }

lenovo/thinkpad/t440p/default.nix

@@ -1,7 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../. ];
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+  ];
 
   boot = {
     extraModprobeConfig = lib.mkDefault ''
@@ -9,6 +12,4 @@
     '';
     kernelModules = [ "tpm-rng" ];
   };
-
-  services.xserver.videoDrivers = [ "intel" ];
 }

lenovo/thinkpad/t460s/default.nix

@@ -1,11 +1,12 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../. ];
+  imports = [
+    ../../../common/cpu/intel
+    ../.
+  ];
 
-  # Use the gummiboot efi boot loader. (From default generated configuration.nix)
+  # TODO: boot loader
   boot.loader.systemd-boot.enable = lib.mkDefault true;
   boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
-
-  services.xserver.videoDrivers = [ "intel" ];
 }

lenovo/thinkpad/x140e/default.nix

@@ -1,7 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../. ];
+  imports = [
+    ../.
+    ../../../common/cpu/amd
+  ];
 
   boot.extraModprobeConfig = lib.mkDefault ''
     options snd_hda_intel enable=0,1

lenovo/thinkpad/x220/default.nix

@@ -1,9 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../. ../tp-smapi.nix ];
-
-  # hard disk protection if the laptop falls
-  services.hdapsd.enable = lib.mkDefault true;
-  services.xserver.videoDrivers = [ "intel" ];
+  imports = [
+    ../.
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop/hdd
+    ../tp-smapi.nix
+  ];
 }