5 files changed, 39 insertions, 10 deletions
diff --git a/makefu/2configs/binary-cache/lass.nix b/makefu/2configs/binary-cache/lass.nix
new file mode 100644
index 000000000..4813eeb0f
--- /dev/null
+++ b/makefu/2configs/binary-cache/lass.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  nix = {
+    binaryCaches = [
+      "http://cache.prism.r"
+    ];
+    binaryCachePublicKeys = [
+      "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+    ];
+  };
+}
diff --git a/makefu/2configs/binary-cache/nixos.nix b/makefu/2configs/binary-cache/nixos.nix
new file mode 100644
index 000000000..2ff5e1307
--- /dev/null
+++ b/makefu/2configs/binary-cache/nixos.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  nix = {
+    binaryCaches = [
+      "https://cache.nixos.org/"
+    ];
+    binaryCachePublicKeys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    ];
+  };
+}
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 422927b28..acd34b0d3 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -2,8 +2,6 @@
 
 with config.krebs.lib;
 {
-  system.stateVersion = "15.09";
-
   imports = [
     {
       users.extraUsers =
@@ -11,6 +9,8 @@ with config.krebs.lib;
                  (import <secrets/hashedPasswords.nix>);
     }
     ./vim.nix
+    ./binary-cache/nixos.nix
+    ./binary-cache/lass.nix
   ];
 
   nixpkgs.config.allowUnfreePredicate =  (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
@@ -24,7 +24,7 @@ with config.krebs.lib;
       source =  mapAttrs (_: mkDefault) {
         nixpkgs = {
           url = https://github.com/nixos/nixpkgs;
-          rev = "63b9785"; # stable @ 2016-06-01
+          rev = "0546a4a"; # stable @ 2016-06-11
         };
         secrets = if getEnv "dummy_secrets" == "true"
                   then toString <stockholm/makefu/6tests/data/secrets>
@@ -62,9 +62,6 @@ with config.krebs.lib;
 
   programs.ssh = {
     startAgent = false;
-    extraConfig = ''
-      UseRoaming no
-    '';
   };
   services.openssh.enable = true;
   nix.useChroot = true;
diff --git a/makefu/2configs/temp-share-samba.nix b/makefu/2configs/temp-share-samba.nix
index 5f21e3bf7..0907c2dbf 100644
--- a/makefu/2configs/temp-share-samba.nix
+++ b/makefu/2configs/temp-share-samba.nix
@@ -1,9 +1,12 @@
 {config, ... }:{
+  networking.firewall.allowedUDPPorts = [ 137 138 ];
+  networking.firewall.allowedTCPPorts = [ 139 445 ];
   users.users.smbguest = {
     name = "smbguest";
     uid = config.ids.uids.smbguest;
     description = "smb guest user";
-    home = "/var/empty";
+    home = "/home/share";
+    createHome = true;
   };
   services.samba = {
     enable = true;
diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
index aaabcd50e..2b4e24774 100644
--- a/makefu/2configs/virtualization-virtualbox.nix
+++ b/makefu/2configs/virtualization-virtualbox.nix
@@ -2,8 +2,8 @@
 
 let
   mainUser = config.krebs.build.user;
-  version = "5.0.6";
-  rev = "103037";
+  version = "5.0.20";
+  rev = "106931";
   vboxguestpkg = pkgs.fetchurl {
         url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
         sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf";
@@ -14,5 +14,10 @@ in {
   nixpkgs.config.virtualbox.enableExtensionPack = true;
 
   users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
-  environment.systemPackages = [ vboxguestpkg ];
+  nixpkgs.config.packageOverrides = super: {
+    boot.kernelPackages = super.boot.kernelPackages.virtualbox.override {
+      buildInputs = super.boot.kernelPackages.virtualBox.buildInputs
+        ++ [ vboxguestpkg ];
+    };
+  };
 }