summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/hw/tp-x220.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-13 12:54:15 +0200
committerlassulus <lass@aidsballs.de>2016-06-13 12:54:15 +0200
commitb244441223ac192926da8465dea3273c225bbd68 (patch)
treeb688576b2219b6aefc5663f7d227016a590fc194 /makefu/2configs/hw/tp-x220.nix
parentf832a63ce045823c1aeafec48fbe32b78ed7cd6d (diff)
parentb9c0c46b4d0f9907f1b3fc96494be96abc60c8db (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/hw/tp-x220.nix')
-rw-r--r--makefu/2configs/hw/tp-x220.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix
index be3d1eb7..1c9a3496 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x220.nix
@@ -5,7 +5,7 @@ with config.krebs.lib;
imports = [ ./tp-x2x0.nix ];
boot = {
- kernelModules = [ "kvm-intel" "acpi_call" ];
+ kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
};
@@ -28,7 +28,7 @@ with config.krebs.lib;
# enable HDMI output switching with pulseaudio
hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" ''
- ${builtins.readFile "${config.hardware.pulseaudio.package}/etc/pulse/default.pa"}
+ ${builtins.readFile "${config.hardware.pulseaudio.package.out}/etc/pulse/default.pa"}
load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"
'';