diff --git a/basic-tools.nix b/basic-tools.nix
new file mode 100644
index 0000000..51f7a0e
--- /dev/null
+++ b/basic-tools.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
+    stdenv
+    nox
+    wget
+    vim_configurable
+    zsh
+    gitFull gitAndTools.hub tig
+    gnumake
+    gmpc
+    m4
+    screen
+    psmisc
+    pkgs.parallel
+    gnupg
+    pwgen
+    gcc
+    silver-searcher
+    tree
+    python
+    python34
+    python34Packages.ipython
+    gdb
+    mpv
+    bind nmap tcpdump telnet
+    dstat
+    which
+    zip
+    file
+    unzip
+    elinks
+    ctags
+    nix-prefetch-scripts
+    nix-repl
+    jq
+  ];
+
+  environment.variables.EDITOR = "${pkgs.vim}/bin/vim";
+
+  programs.zsh = {
+    enable = true;
+    promptInit = "";
+  };
+}
diff --git a/common.nix b/common.nix
index a4dad5b..6661dcb 100644
--- a/common.nix
+++ b/common.nix
@@ -5,6 +5,7 @@
     [
       /etc/nixos/hardware-configuration.nix
       ./i3.nix
+      ./basic-tools.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -30,22 +31,13 @@
   # };
 
   environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    stdenv
-    nox
-    wget
-    vim_configurable
-    zsh
-    gitFull gitAndTools.hub tig gitg
-    gnumake
+    gitg
     gmpc
     m4
     subversion
     openjdk8
     sbt scala
     idea.idea-community
-    screen
-    psmisc
-    pkgs.parallel
     firefoxWrapper
     chromium
     thunderbird
@@ -54,32 +46,15 @@
     viewnior
     gnupg
     pass xclip pwgen
-    gcc
     remmina
-    silver-searcher
-    tree
-    python
-    python34
-    python34Packages.ipython
     ledger
     hledger
     hledger-diff
     cmake
     vimPlugins.YouCompleteMe
-    gdb
     mpv
-    bind nmap wireshark-gtk tcpdump telnet
-    dstat
-    which
-    zip
-    file
-    unzip
-    elinks
-    ctags
+    wireshark-gtk
     mutt
-    nix-prefetch-scripts
-    nix-repl
-    jq
 
     texLiveFull biber
     androidsdk_4_4
@@ -119,8 +94,6 @@
 
     coq_8_5
     emacsPackages.proofgeneral_4_3_pre
-
-    nix-repl
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: rec {
@@ -128,8 +101,6 @@
 
   nixpkgs.config.allowTexliveBuilds = true;
 
-  environment.variables.EDITOR = "${pkgs.vim}/bin/vim";
-
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
@@ -163,10 +134,6 @@
     options = "noauto,x-systemd.automount,credentials=/etc/smbcredentials/aruanus";
   };
 
-  programs.zsh = {
-    enable = true;
-    promptInit = "";
-  };
   users.extraUsers.gebner = {
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" ];