m : update legacy options ,remove honeyd usage in shoney

3 files changed, 9 insertions, 8 deletions

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index cba7462f..c94f1be7 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -66,7 +66,7 @@ with config.krebs.lib;
     startAgent = false;
   };
   services.openssh.enable = true;
-  nix.useChroot = true;
+  nix.useSandbox = true;
 
   users.mutableUsers = false;
 
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix
index 1c9a3496..58390e48 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x220.nix
@@ -8,10 +8,9 @@ with config.krebs.lib;
     kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
     extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
   };
-
+  hardware.opengl.extraPackages =  [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
   services.xserver = {
     videoDriver = "intel";
-    vaapiDrivers = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
     deviceSection = ''
       Option "AccelMethod" "sna"
     '';
diff --git a/makefu/2configs/virtualization-virtualbox.nix b/makefu/2configs/virtualization-virtualbox.nix
index 2b4e2477..7a14dea7 100644
--- a/makefu/2configs/virtualization-virtualbox.nix
+++ b/makefu/2configs/virtualization-virtualbox.nix
@@ -2,20 +2,22 @@
 
 let
   mainUser = config.krebs.build.user;
-  version = "5.0.20";
-  rev = "106931";
-  vboxguestpkg = pkgs.fetchurl {
+  vboxguestpkg =  lib.stdenv.mkDerivation rec {
+    name = "Virtualbox-Extensions-${version}-${rev}";
+    version = "5.0.20";
+    rev = "106931";
+    src = pkgs.fetchurl {
         url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
         sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf";
       };
+  };
 in {
-  #inherit vboxguestpkg;
   virtualisation.virtualbox.host.enable = true;
   nixpkgs.config.virtualbox.enableExtensionPack = true;
 
   users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
   nixpkgs.config.packageOverrides = super: {
-    boot.kernelPackages = super.boot.kernelPackages.virtualbox.override {
+    boot.kernelPackages.virtualbox = super.boot.kernelPackages.virtualbox.override {
       buildInputs = super.boot.kernelPackages.virtualBox.buildInputs
         ++ [ vboxguestpkg ];
     };