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 | |
| parent | 4feafd70204f9c13500bd427d250fac60ca595ef (diff) | |
| parent | 676c76dd8e0b5cbe3d1bdba49b21b1b5cfc578a1 (diff) | |
Merge branch 'master' of prism:stockholm
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 fdae354ff..a09eed958 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 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" ]; diff --git a/nin/source.nix b/nin/source.nix index 188ebafcc..ccf5e6acc 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"; }; } |