From 912bdee7cd2e4b92627b63f48c9d455bc7fb1a56 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 06:49:20 +0100
Subject: collections: Add common packages from user env.

I'm not using all of them in a regular basis, but some packages such as
Gimp really need a ton of time to build, so let's build them on our
Hydra.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 collections/aszlig.nix | 23 ++++++++++++++++++++++-
 common.nix             |  1 +
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/collections/aszlig.nix b/collections/aszlig.nix
index 5e980fe5..aae1b3bf 100644
--- a/collections/aszlig.nix
+++ b/collections/aszlig.nix
@@ -8,6 +8,7 @@ with pkgs;
     cabal2nix
     darcs
     diagrams
+    bytedump
     yesod yesodStatic yesodDefault yesodTest
     hjsmin persistentSqlite
   ];
@@ -19,8 +20,15 @@ with pkgs;
     polib
   ];
 
+  games = [
+    uqm
+  ];
+
   shell = [
+    ascii
+    apg
     dash
+    dos2unix
     taskwarrior
     screen
     figlet
@@ -33,15 +41,21 @@ with pkgs;
     w3m
     fbida
     mutt
+    p7zip
     rlwrap
+    unzip
+    vbindiff
   ];
 
   multimedia = [
     pulseaudio pvolctrl
+    miro
     mplayer
+    picard
     vorbisTools
     mpg321
     mp3info
+    pavucontrol
   ];
 
   crypto = [
@@ -55,6 +69,9 @@ with pkgs;
     gitFull
     gdb
     gnumake
+    gitAndTools.hub
+    nix-repl
+    nixpkgs-lint
     ltrace strace
     valgrind
   ];
@@ -62,6 +79,7 @@ with pkgs;
   dicts = with aspellDicts; [ de en ];
 
   net = [
+    mtr
     netrw
     nmap
     socat
@@ -70,7 +88,8 @@ with pkgs;
   ];
 
   x11 = [
-    i3 i3lock i3status dmenu conky
+    scrot
+    i3 i3lock
     gajim
     xpdf
   ];
@@ -78,8 +97,10 @@ with pkgs;
   misc = [
     lastwatch
     chromiumBetaWrapper
+    firefox
     glxinfo
     imagemagick
+    gimp
     graphviz
     youtubeDL
     ghostscript
diff --git a/common.nix b/common.nix
index 91e51602..e435051e 100644
--- a/common.nix
+++ b/common.nix
@@ -198,6 +198,7 @@
     cacert
     file
     htop
+    iotop
     psmisc
     binutils
     unrar
-- 
cgit 1.4.1