{pkgs,services}_common: Reenable vbox and libvirtd

2 files changed, 21 insertions, 15 deletions

diff --git a/pkgs/pkgs_common.nix b/pkgs/pkgs_common.nix
index 06d7ae67..73d97ef4 100644
--- a/pkgs/pkgs_common.nix
+++ b/pkgs/pkgs_common.nix
@@ -22,9 +22,9 @@
       enableOfficalBranding = true;
     };
 
-#    virtualbox = {
-#      enableExtensionPack = true;
-#    };
+    virtualbox = {
+      enableExtensionPack = true;
+    };
 
     mpv = {
       youtubeSupport = true;
@@ -33,6 +33,9 @@
 
   environment.systemPackages = with pkgs; [
     #(lib.overrideDerivation mcabber (o: { buildInputs = (o.buildInputs or []) ++ lib.singleton pkgs.gpgme; }))
+    #john
+    #sleuthkit
+    #texLiveFull
     abook
     accountsservice
     apg
@@ -142,7 +145,6 @@
     iptraf-ng
     ipv6calc
     jfsutils
-    #john
     jwhois
     keepassx
     kpcli
@@ -207,6 +209,7 @@
     python34Packages.hovercraft
     pythonPackages.livestreamer
     pythonPackages.rainbowstream
+    qemu
     qrencode
     recode
     reiserfsprogs
@@ -217,7 +220,6 @@
     scrot
     shntool
     silver-searcher
-    #sleuthkit
     smartmontools
     sox
     spek
@@ -229,7 +231,6 @@
     taskwarrior
     telnet
     testdisk
-    #texLiveFull
     texmacs
     tftp-hpa
     tldr
@@ -247,6 +248,7 @@
     valgrind
     vanilla-dmz
     vim_configurable
+    virtualbox
     vit
     vlc
     vlock
@@ -269,7 +271,7 @@
     zathura
     zbar
     zip
-    zsync
     zotero
+    zsync
   ];
 }
diff --git a/services/services_common.nix b/services/services_common.nix
index 1cb7a6a3..049ea607 100644
--- a/services/services_common.nix
+++ b/services/services_common.nix
@@ -1,14 +1,18 @@
 { config, pkgs, lib, ... }:
 
 {
-#  virtualisation = {
-#    virtualbox = {
-#      host = {
-#        enable = true;
-#        enableHardening = true;
-#      };
-#    };
-#  };
+  virtualisation = {
+    virtualbox = {
+      host = {
+        enable = true;
+        enableHardening = true;
+      };
+    };
+    libvirtd = {
+      enable = true;
+      enableKVM = true;
+    };
+  };
 
   services = {
     gpm.enable = true;