From e2b141e6ad6aac4028c852d58cdae73884ddec0a Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 27 Sep 2015 19:33:09 +0200 Subject: pnp: use new sources --- makefu/1systems/pnp.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'makefu/1systems/pnp.nix') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 2dce87d5d..497c03e11 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. # Base ../2configs/base.nix + ../2configs/base-sources.nix ../2configs/tinc-basic-retiolum.nix # HW/FS @@ -38,12 +39,6 @@ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - krebs.build.deps = { - nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "03921972268934d900cc32dad253ff383926771c"; - }; - }; networking.firewall.allowedTCPPorts = [ # nginx runs on 80 -- cgit v1.2.3 From d9f4d621bcde5ddc983a922e378657dba1f6e141 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 27 Sep 2015 21:50:40 +0200 Subject: Reaktor: add extraEnviron for setting Channel --- makefu/1systems/pnp.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'makefu/1systems/pnp.nix') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 497c03e11..7698ea14d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -32,6 +32,10 @@ ]; krebs.Reaktor.enable = true; krebs.Reaktor.debug = true; + krebs.Reaktor.nickname = "Reaktor|bot"; + krebs.Reaktor.extraEnviron = { + REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + }; krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; -- cgit v1.2.3