summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-27 21:44:47 +0100
committermakefu <github@syntax-fehler.de>2015-11-27 21:44:47 +0100
commit74ebb5b01c85234f0f9e25428dc042b02caa6584 (patch)
tree7c0d4dad6ddcc300efc80c31fc33de03b6724183 /tv/1systems
parent42347456453b864d83d26ec952cfb770095d0a81 (diff)
parentd0913afc37d7da6c22d97b7da3c687d494567041 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 3fa5481e2..cd3139754 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 94656ab61..eac36fafb 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