6 files changed, 20 insertions, 8 deletions
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 09344d99d..e64e216e0 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -2,9 +2,10 @@
   imports = [
     ./core.nix
     ./core-gui.nix
-    ./extra-gui.nix
     ./dev.nix
-    ./sec.nix
+    ./extra-gui.nix
+    ./games.nix
     ./media.nix
+    ./sec.nix
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 518a60eac..654e83baa 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -16,7 +16,6 @@
     mirage
     tightvnc
     gnome3.dconf
-    vlc
     wireshark
     xdotool
     scrot
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 56d60812e..86d72c662 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -9,12 +9,14 @@
     at_spi2_core
     acpi
     bc
+    rsync
     exif
     file
     ntfs3g
     pv
     proot
     sshpass
+    populate
     usbutils
     p7zip
     hdparm
@@ -30,7 +32,10 @@
     wol
     tmux
     smartmontools
+    cifs-utils
     iftop
+    taskwarrior
+    mplayer
 
     cac-api
     cac-panel
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 6b8a5af66..9cfacf408 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -7,6 +7,6 @@
     skype
     virtmanager
     synergy
-    
+    saleae-logic
   ];
 }
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
new file mode 100644
index 000000000..34c686451
--- /dev/null
+++ b/makefu/2configs/tools/games.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    steam
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 67159a176..4fc3413e8 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
   krebs.per-user.makefu.packages = with pkgs; [
     kodi
     streamripper
+    youtube-dl
+    calibre
+    vlc
+    mumble
   ];
 }