diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-01-01 18:37:53 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-01-01 18:41:20 +0100 |
| commit | f577343f35b77d65866695b47c758c0037499a82 (patch) | |
| tree | f8772d45c9421f85d76ff1deb2d9ccafa5ad00a1 /machines | |
| parent | 010daf75902c3dc9ea449cfc202fb8004e3d45e1 (diff) | |
machines/haenk: Enable PulseAudio everywhere
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/aszlig/managed/haenk.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index a2764cbe..01e3bd38 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -26,17 +26,21 @@ device = "/dev/disk/by-uuid/b5ea0ae8-20c6-43dd-ad97-6d8c783dac02"; }; - hardware.cpu.amd.updateMicrocode = true; + hardware = { + cpu.amd.updateMicrocode = true; - hardware.firmware = lib.singleton (pkgs.runCommand "ipw2x00-firmware" {} '' - mkdir -p "$out/lib/firmware" - cp "${pkgs.fetchgit rec { - name = "ipw2x00-20151227"; - url = "git://anonscm.debian.org/kernel/firmware-nonfree.git"; - rev = "e4147b94a856dfe7d4dac11b5da7d9e96b3c2e95"; - sha256 = "18kymqzhlppj520n6vkq5666qgryz3prym1pxn3sqv34yvav7agi"; - }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/" - ''); + firmware = lib.singleton (pkgs.runCommand "ipw2x00-firmware" {} '' + mkdir -p "$out/lib/firmware" + cp "${pkgs.fetchgit rec { + name = "ipw2x00-20151227"; + url = "git://anonscm.debian.org/kernel/firmware-nonfree.git"; + rev = "e4147b94a856dfe7d4dac11b5da7d9e96b3c2e95"; + sha256 = "18kymqzhlppj520n6vkq5666qgryz3prym1pxn3sqv34yvav7agi"; + }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/" + ''); + + pulseaudio = true; + }; i18n.consoleKeyMap = "de"; i18n.defaultLocale = "en_US.UTF-8"; @@ -54,6 +58,7 @@ ''; nixpkgs.config = { + pulseaudio = true; packageOverrides = opkgs: { # This is because the driver for the NV44M GPU doesn't like LLVM 3.7 mesa_noglu = pkgs.mesa_noglu.override { |