diff options
| author | makefu <github@syntax-fehler.de> | 2017-12-18 21:24:28 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-12-18 21:24:28 +0100 |
| commit | af308642031f971bc30c5694385eb7af1e9ea618 (patch) | |
| tree | 7e9e55f7d5de874a61a5d9294065a4f9749ee83e /nin/2configs | |
| parent | 4feafd70204f9c13500bd427d250fac60ca595ef (diff) | |
| parent | 676c76dd8e0b5cbe3d1bdba49b21b1b5cfc578a1 (diff) | |
Merge branch 'master' of prism:stockholm
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" ]; |