diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-27 21:44:47 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-27 21:44:47 +0100 |
| commit | 88382d74ed18b48620d2817dffa6b720173ce329 (patch) | |
| tree | 09b156e721aff5c674e546b9175c11ef912e7146 /tv/1systems | |
| parent | b5500ca586831ee151852a31e1d1d52b527c6b41 (diff) | |
| parent | f6cca2cdd06d5d65fdb4b08bfceff7a36403f678 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/wu.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 3fa5481..cd31397 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -10,6 +10,7 @@ with lib; #../2configs/consul-client.nix ../2configs/git.nix ../2configs/mail-client.nix + ../2configs/pulse.nix ../2configs/xserver { environment.systemPackages = with pkgs; [ @@ -193,7 +194,6 @@ with lib; hardware.bumblebee.group = "video"; hardware.enableAllFirmware = true; hardware.opengl.driSupport32Bit = true; - hardware.pulseaudio.enable = true; environment.systemPackages = with pkgs; [ xlibs.fontschumachermisc diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 94656ab..eac36fa 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -13,6 +13,7 @@ with lib; #../2configs/consul-client.nix ../2configs/git.nix ../2configs/mail-client.nix + ../2configs/pulse.nix ../2configs/xserver { environment.systemPackages = with pkgs; [ @@ -195,7 +196,6 @@ with lib; #hardware.bumblebee.group = "video"; hardware.enableAllFirmware = true; #hardware.opengl.driSupport32Bit = true; - hardware.pulseaudio.enable = true; environment.systemPackages = with pkgs; [ #xlibs.fontschumachermisc |