x: use nixos-hardware

4 files changed, 24 insertions, 28 deletions

diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix
index 6dc17b656..6278877c3 100644
--- a/makefu/1systems/x/source.nix
+++ b/makefu/1systems/x/source.nix
@@ -1,5 +1,7 @@
 import <stockholm/makefu/source.nix> {
   name="x";
   full = true;
+  python = true;
+  hw = true;
   # torrent = true;
 }
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 14572b35c..ec4e05d1b 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -3,38 +3,14 @@
 with import <stockholm/lib>;
 {
 
-  imports = [ ./tp-x2x0.nix ];
-  boot = {
-    # tp-smapi is not supported bt x230 anymore
-    kernelModules = [
-      "kvm-intel"
-      "thinkpad_ec"
-      "acpi_call"
-   #   "thinkpad_acpi"
-   #   "tpm-rng"
-    ];
-    extraModulePackages = [
-      config.boot.kernelPackages.acpi_call
-    ];
-    # support backlight adjustment
-    kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
-  };
+  imports = [ ./tp-x2x0.nix  <nixos-hardware/lenovo/thinkpad/x230> ];
 
   # configured media keys inside awesomerc
   # sound.mediaKeys.enable = true;
   hardware.bluetooth.enable = true;
 
-  services.acpid.enable = true;
-  hardware.opengl.extraPackages =  [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
-  services.xserver = {
-    videoDriver = "intel";
-    deviceSection = ''
-      Option "AccelMethod" "sna"
-      Option "Backlight"     "intel_backlight"
-    '';
-  };
-
-  security.rngd.enable = true;
+  # possible i915 powersave options:
+  #  options i915 enable_rc6=1 enable_fbc=1 semaphores=1
 
   services.xserver.displayManager.sessionCommands =''
     xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 81c4bf4c8..680545c99 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -17,6 +17,8 @@ with import <stockholm/lib>;
 
   # enable synaptics so we can easily disable the touchpad
   #   enable the touchpad with `synclient TouchpadOff=0`
+
+  services.xserver.libinput.enable = false;
   services.xserver.synaptics = {
     enable = true;
     additionalOptions = ''Option "TouchpadOff" "1"'';
diff --git a/makefu/source.nix b/makefu/source.nix
index ce5855430..2456dc76e 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -4,7 +4,9 @@ host@{ name,
   secure ? false,
   full ? false,
   torrent ? false,
-  musnix ? false
+  hw ? false,
+  musnix ? false,
+  python ? false
 }:
 let
   builder = if getEnv "dummy_secrets" == "true"
@@ -45,6 +47,20 @@ in
         ref = "d8b989f";
       };
     })
+
+    (mkIf ( hw ) {
+      nixos-hardware.git = {
+        url = https://github.com/makefu/nixos-hardware.git;
+        ref = "1fef1c1";
+      };
+    })
+
+    (mkIf ( python ) {
+      python.git = {
+        url = https://github.com/garbas/nixpkgs-python;
+        ref = "cac319b";
+      };
+    })
     (mkIf ( torrent ) {
       torrent-secrets.file = getAttr builder {
         buildbot = toString <stockholm/makefu/6tests/data/secrets>;