From 183eafa43d69199a26d283ae05b26c41ec23ed22 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 26 Aug 2015 12:22:16 +0200
Subject: [PATCH] Include more packages by default.

---
 archachatina.nix |  5 -----
 common.nix       | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/archachatina.nix b/archachatina.nix
index d4ec5b6..5016bc7 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -17,13 +17,8 @@
     mediainfo
     flac
 
-    libreoffice
     recoll
-    minisat
-    prover9
     uvccapture
-    veriT
-    nix-repl
   ];
 
 }
diff --git a/common.nix b/common.nix
index ced6fa2..544e06b 100644
--- a/common.nix
+++ b/common.nix
@@ -29,7 +29,7 @@
   #   defaultLocale = "en_US.UTF-8";
   # };
 
-  environment.systemPackages = with pkgs; with haskellngPackages; [
+  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
     stdenv
     nox
     wget
@@ -94,6 +94,23 @@
     emacs
     ghostscript # for auctex
     aspell
+
+    libreoffice
+    calibre
+    mediainfo
+
+    isync
+    mu
+    msmtp
+
+    veriT
+    minisat
+    prover9
+    eprover
+    z3
+    why3
+
+    nix-repl
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: rec {