Merge remote-tracking branch 'onondaga/master'

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

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 =

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" ];

nin/source.nix

@@ -14,6 +14,6 @@ in
     stockholm.file = toString <stockholm>;
     nixpkgs.git = {
       url = https://github.com/nixos/nixpkgs;
-      ref = "c99239b";
+      ref = "afe9649";
     };
   }