diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-02 20:51:37 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-02 20:51:37 +0100 |
| commit | ef8ed48b1c576238e8fd6cbaef0d0208d8cc1b68 (patch) | |
| tree | 15d9dc2aadbba7d0c7c6338d6441af7849cc248b /makefu/1systems | |
| parent | 024de57e7b1918a617685b65a0c5c45ee4592e47 (diff) | |
| parent | db72d5911f1556d3b1cfbe8f1a2d8f6765728952 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 4 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index b2cf0be79..9415f2345 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -8,6 +8,7 @@ [ # Include the results of the hardware scan. ../. ../2configs/main-laptop.nix #< base-gui + zsh + ../2configs/laptop-utils.nix # Krebs ../2configs/tinc-basic-retiolum.nix @@ -39,6 +40,9 @@ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; + # steam + hardware.opengl.driSupport32Bit = true; + hardware.pulseaudio.support32Bit = true; # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 747321968..462ec4faf 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -11,7 +11,6 @@ in { # TODO: copy this config or move to krebs ../../tv/2configs/hw/CAC.nix ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix - ../2configs/unstable-sources.nix ../2configs/headless.nix ../2configs/tinc-basic-retiolum.nix @@ -28,7 +27,8 @@ in { # collectd ../2configs/collectd/collectd-base.nix ]; - + services.nixosManual.enable = false; + programs.man.enable = false; krebs.build.host = config.krebs.hosts.wry; krebs.Reaktor = { |