From fbe1fcdd8e145493602da65f0a22b1907c2b3a95 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 Jul 2016 00:13:01 +0200 Subject: [PATCH] m : update legacy options ,remove honeyd usage in shoney --- makefu/1systems/shoney.nix | 3 --- makefu/2configs/default.nix | 2 +- makefu/2configs/hw/tp-x220.nix | 3 +-- makefu/2configs/virtualization-virtualbox.nix | 12 +++++++----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix index 0e6ae6e17..7081f6a95 100644 --- a/makefu/1systems/shoney.nix +++ b/makefu/1systems/shoney.nix @@ -17,9 +17,6 @@ in { ]; - environment.systemPackages = [ pkgs.honeyd ]; - services.tinc.networks.siem.name = "sjump"; - krebs = { enable = true; build.host = config.krebs.hosts.shoney; diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index cba7462f1..c94f1be7d 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 1c9a34965..58390e48d 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 2b4e24774..7a14dea7f 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 ]; };