Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m : update legacy options ,remove honeyd usage in shoney

Browse Source
This commit is contained in:
makefu 2016-07-21 00:13:01 +02:00
parent db4d4b8890
commit fbe1fcdd8e
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefu/1systems/shoney.nix
View File

@ -17,9 +17,6 @@ in {
]; ];
environment.systemPackages = [ pkgs.honeyd ];
services.tinc.networks.siem.name = "sjump";
krebs = { krebs = {
enable = true; enable = true;
build.host = config.krebs.hosts.shoney; build.host = config.krebs.hosts.shoney;

2
makefu/2configs/default.nix
View File

@ -66,7 +66,7 @@ with config.krebs.lib;
startAgent = false; startAgent = false;
}; };
services.openssh.enable = true; services.openssh.enable = true;
nix.useChroot = true; nix.useSandbox = true;
users.mutableUsers = false; users.mutableUsers = false;

3
makefu/2configs/hw/tp-x220.nix
View File

@ -8,10 +8,9 @@ with config.krebs.lib;
kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ]; kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ];
extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
}; };
hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
services.xserver = { services.xserver = {
videoDriver = "intel"; videoDriver = "intel";
vaapiDrivers = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
deviceSection = '' deviceSection = ''
Option "AccelMethod" "sna" Option "AccelMethod" "sna"
''; '';

12
makefu/2configs/virtualization-virtualbox.nix
View File

@ -2,20 +2,22 @@
let let
mainUser = config.krebs.build.user; mainUser = config.krebs.build.user;
version = "5.0.20"; vboxguestpkg = lib.stdenv.mkDerivation rec {
rev = "106931"; name = "Virtualbox-Extensions-${version}-${rev}";
vboxguestpkg = pkgs.fetchurl { 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"; url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}-${rev}.vbox-extpack";
sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf"; sha256 = "1dc70x2m7x266zzw5vw36mxqj7xykkbk357fc77f9zrv4lylzvaf";
}; };
};
in { in {
#inherit vboxguestpkg;
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
nixpkgs.config.virtualbox.enableExtensionPack = true; nixpkgs.config.virtualbox.enableExtensionPack = true;
users.extraGroups.vboxusers.members = [ "${mainUser.name}" ]; users.extraGroups.vboxusers.members = [ "${mainUser.name}" ];
nixpkgs.config.packageOverrides = super: { 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 buildInputs = super.boot.kernelPackages.virtualBox.buildInputs
++ [ vboxguestpkg ]; ++ [ vboxguestpkg ];
}; };