diff options
| author | makefu <makefu@nixos.dev> | 2016-01-18 12:50:20 +0100 |
|---|---|---|
| committer | makefu <makefu@nixos.dev> | 2016-01-18 12:50:20 +0100 |
| commit | f4754010336a1d7c876bc6797a44f30e3d4b4ead (patch) | |
| tree | de4dff5340b76d970cc404146e688726e4446e0f /makefu/1systems/pornocauster.nix | |
| parent | b86daca11669019d3c2218e623bfb57b5a8033d7 (diff) | |
| parent | de891cf43181d28cbc9526993df4e55022d230da (diff) | |
Merge branch 'master' of gum:stockholm
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 28b77d330..d7fa8edc5 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -26,6 +26,7 @@ # services ../2configs/git/brain-retiolum.nix ../2configs/tor.nix + # ../2configs/buildbot-standalone.nix # hardware specifics are in here ../2configs/hw/tp-x220.nix @@ -34,16 +35,18 @@ # ../2configs/mediawiki.nix #../2configs/wordpress.nix ]; + hardware.sane.enable = true; + hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ]; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; - buildbot = let - pkgs1509 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {}; - in pkgs1509.buildbot; }; - makefu.buildbot.master.enable = true; - #krebs.Reaktor.enable = true; - #krebs.Reaktor.nickname = "makefu|r"; + krebs.Reaktor = { + enable = false; + nickname = "makefu|r"; + plugins = with pkgs.ReaktorPlugins; [ nixos-version random-emoji ]; + }; + # nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ]; environment.systemPackages = with pkgs;[ @@ -58,6 +61,7 @@ hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" '' ${builtins.readFile "${config.hardware.pulseaudio.package}/etc/pulse/default.pa"} load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"''; + networking.firewall.enable = false; networking.firewall.allowedTCPPorts = [ 25 ]; |