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 | fd50630abb30c45ceb2ec7adfa4cc30a24c75540 (patch) | |
| tree | b38ee703e1670ba2bbd6e446d9a1ceec1ccba03e /nin | |
| parent | 4eaaf658d6a81e91bda9752dbe7f84c0e45c9e1b (diff) | |
| parent | ae958bfec23ba1e7a31c8bec8af9b1c48fe33538 (diff) | |
Merge remote-tracking branch 'prism/staging/test'
Diffstat (limited to 'nin')
| -rw-r--r-- | nin/1systems/hiawatha/config.nix | 2 | ||||
| -rw-r--r-- | nin/2configs/default.nix | 1 | ||||
| -rw-r--r-- | nin/2configs/git.nix | 4 | ||||
| -rw-r--r-- | nin/source.nix | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/nin/1systems/hiawatha/config.nix b/nin/1systems/hiawatha/config.nix index fdae354..a09eed9 100644 --- a/nin/1systems/hiawatha/config.nix +++ b/nin/1systems/hiawatha/config.nix @@ -15,7 +15,6 @@ with lib; <stockholm/nin/2configs/git.nix> <stockholm/nin/2configs/retiolum.nix> <stockholm/nin/2configs/termite.nix> - <stockholm/nin/2configs/skype.nix> ]; krebs.build.host = config.krebs.hosts.hiawatha; @@ -87,6 +86,7 @@ with lib; environment.systemPackages = with pkgs; [ firefox git + lmms networkmanagerapplet python steam diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index 0d2253c..d7b89c8 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 6bdc857..2a86046 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" ]; diff --git a/nin/source.nix b/nin/source.nix index 188ebaf..ccf5e6a 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -14,6 +14,6 @@ in stockholm.file = toString <stockholm>; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "c99239b"; + ref = "afe9649"; }; } |