summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-12-04 10:16:09 +0100
committermakefu <github@syntax-fehler.de>2015-12-04 10:16:09 +0100
commit65cc52e01e18c823016a3043b8cf41822934cc3c (patch)
tree58aa8971a4e571234a762eee20c7ec7f57a2b4d4 /tv/1systems
parent597f9e8597c95ac9e4cba1689322c433bb0c9a75 (diff)
parentb5ffb88ba3a77d4f399d7a2815e2c61d53545f5d (diff)
Merge branch 'master' of pnp:stockholm
Conflicts: makefu/1systems/gum.nix
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