From 589940971657244bac8ab621a03b991375f1736d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Sep 2017 09:10:46 +0200
Subject: [PATCH] Update common packages.

---
 common-sw.nix | 11 ++++-------
 i3.nix        |  1 +
 large-sw.nix  |  3 +--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common-sw.nix b/common-sw.nix
index 75d0e37..6483cb6 100644
--- a/common-sw.nix
+++ b/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 {};
diff --git a/i3.nix b/i3.nix
index 90d89a4..263d08c 100644
--- a/i3.nix
+++ b/i3.nix
@@ -26,6 +26,7 @@
     xdotool
     scrot
     pavucontrol
+    dconf-editor
 
     # gnome3 core packages
     desktop_file_utils shared_mime_info
diff --git a/large-sw.nix b/large-sw.nix
index 1f0816d..c6c6a4c 100644
--- a/large-sw.nix
+++ b/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