diff options
| author | tv <tv@krebsco.de> | 2016-03-16 00:13:58 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-03-16 00:13:58 +0100 |
| commit | 2452d211737e0544e9cc92ae44da69940632a750 (patch) | |
| tree | ecb0e2d9932805a6b40be7e09ab5206201e7aba7 /makefu/1systems/pornocauster.nix | |
| parent | 13df24f8f09469c32077ded463d99033042e25ee (diff) | |
| parent | 03a72ef958055c958992c4fbde618c1e68bfff6e (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 9415f2345..119f0e5e4 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -11,7 +11,6 @@ ../2configs/laptop-utils.nix # Krebs - ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix @@ -35,11 +34,10 @@ ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix #../2configs/wordpress.nix + ../2configs/nginx/public_html.nix ]; - nixpkgs.config.packageOverrides = pkgs: { - tinc = pkgs.tinc_pre; - }; + krebs.retiolum.enable = true; # steam hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; @@ -48,6 +46,7 @@ networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 25 + 80 ]; krebs.build.host = config.krebs.hosts.pornocauster; |