Update common packages.

common-sw.nix

@@ -2,16 +2,13 @@
 
 {
   environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    # gitg
+    gitg
     gmpc
     m4
     subversion
     openjdk8
     sbt scala
-    # firefoxWrapper
-    # qutebrowser
     chromium
-    # thunderbird
     qalculate-gtk
     speedcrunch
     viewnior
@@ -114,9 +111,9 @@
     # });
     clion-eap = pkgs.idea.clion;
 
-    neovim = pkgs.neovim.override {
-      extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
-    };
+    # neovim = pkgs.neovim.override {
+    #   extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
+    # };
 
     stablePkgs = stablePkgs;
     stable = import stablePkgs {};

i3.nix

@@ -26,6 +26,7 @@
     xdotool
     scrot
     pavucontrol
+    dconf-editor
 
     # gnome3 core packages
     desktop_file_utils shared_mime_info

large-sw.nix

@@ -5,12 +5,11 @@
     idea-community-eap
     clion-eap
     texlive.combined.scheme-full biber
-    # androidsdk
     gimp
     inkscape
     jabref
     libreoffice-fresh
-    #calibre
+    calibre
 
     # qutebrowser