x: use nixos-hardware

This commit is contained in:
makefu 2017-12-26 23:20:56 +01:00
parent 96c7074c08
commit 2589f81f9a
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
4 changed files with 24 additions and 28 deletions

View File

@ -1,5 +1,7 @@
import <stockholm/makefu/source.nix> { import <stockholm/makefu/source.nix> {
name="x"; name="x";
full = true; full = true;
python = true;
hw = true;
# torrent = true; # torrent = true;
} }

View File

@ -3,38 +3,14 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
imports = [ ./tp-x2x0.nix ]; imports = [ ./tp-x2x0.nix <nixos-hardware/lenovo/thinkpad/x230> ];
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" ];
};
# configured media keys inside awesomerc # configured media keys inside awesomerc
# sound.mediaKeys.enable = true; # sound.mediaKeys.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.acpid.enable = true; # possible i915 powersave options:
hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; # options i915 enable_rc6=1 enable_fbc=1 semaphores=1
services.xserver = {
videoDriver = "intel";
deviceSection = ''
Option "AccelMethod" "sna"
Option "Backlight" "intel_backlight"
'';
};
security.rngd.enable = true;
services.xserver.displayManager.sessionCommands ='' services.xserver.displayManager.sessionCommands =''
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1 xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1

View File

@ -17,6 +17,8 @@ with import <stockholm/lib>;
# enable synaptics so we can easily disable the touchpad # enable synaptics so we can easily disable the touchpad
# enable the touchpad with `synclient TouchpadOff=0` # enable the touchpad with `synclient TouchpadOff=0`
services.xserver.libinput.enable = false;
services.xserver.synaptics = { services.xserver.synaptics = {
enable = true; enable = true;
additionalOptions = ''Option "TouchpadOff" "1"''; additionalOptions = ''Option "TouchpadOff" "1"'';

View File

@ -4,7 +4,9 @@ host@{ name,
secure ? false, secure ? false,
full ? false, full ? false,
torrent ? false, torrent ? false,
musnix ? false hw ? false,
musnix ? false,
python ? false
}: }:
let let
builder = if getEnv "dummy_secrets" == "true" builder = if getEnv "dummy_secrets" == "true"
@ -45,6 +47,20 @@ in
ref = "d8b989f"; 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 ) { (mkIf ( torrent ) {
torrent-secrets.file = getAttr builder { torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot = toString <stockholm/makefu/6tests/data/secrets>;