diff options
| author | tv <tv@krebsco.de> | 2017-12-27 17:09:35 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-12-27 17:09:35 +0100 |
| commit | 6ed214fc77b537dc74b92bbc37e2d2d68dfd9131 (patch) | |
| tree | 97e0ca20812fa54edfa0bd60460800ff2f18626e /nin/2configs | |
| parent | 04b711f516c978e84b334a82008d40dfaad1de1b (diff) | |
| parent | 3a41a73f1fcc32736ace08783d9bfee8a77f3f80 (diff) | |
Merge remote-tracking branch 'prism/staging/test'
Diffstat (limited to 'nin/2configs')
| -rw-r--r-- | nin/2configs/default.nix | 1 | ||||
| -rw-r--r-- | nin/2configs/git.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index 0d2253c27..d7b89c80c 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -4,6 +4,7 @@ with import <stockholm/lib>; { imports = [ ../2configs/vim.nix + <stockholm/krebs/2configs/binary-cache/nixos.nix> <stockholm/krebs/2configs/binary-cache/prism.nix> { users.extraUsers = diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 6bdc857d8..2a8604689 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -40,8 +40,8 @@ let post-receive = pkgs.git-hooks.irc-announce { # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; - channel = "#retiolum"; - server = "ni.r"; + channel = "#xxx"; + server = "irc.r"; verbose = config.krebs.build.host.name == "onondaga"; # TODO define branches in some kind of option per repo branches = [ "master" ]; |