diff options
| author | Markus Hihn <markus.hihn@dcso.de> | 2017-12-15 19:58:16 +0100 |
|---|---|---|
| committer | Markus Hihn <markus.hihn@dcso.de> | 2017-12-15 19:58:16 +0100 |
| commit | 60676b4a8e6dea18a215df76f4dbd6fdf8176638 (patch) | |
| tree | 139b0ee5d7f801efe62a7682fba73208c4bef184 /nin/2configs | |
| parent | 98e5141a8d43064daf6dc75fc9eefb9cb5bb29b7 (diff) | |
| parent | 5b86fe1cd63a5c4cf5a83b7afabe5be34016e8a7 (diff) | |
Merge branch 'master' of prism.r: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" ]; |