From 35c809f61a68c9ee10042317e78ad0a7aa7789bb Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 25 Apr 2016 00:24:24 +0200
Subject: [PATCH] pkgs: use master virtmanager and cleanup neovim

---
 configuration/common/pkg/neovim.nix  | 17 ++++++++---------
 configuration/steveej-laptop/pkg.nix | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/configuration/common/pkg/neovim.nix b/configuration/common/pkg/neovim.nix
index 8dc5c66..d9e80a1 100644
--- a/configuration/common/pkg/neovim.nix
+++ b/configuration/common/pkg/neovim.nix
@@ -1,10 +1,10 @@
 { config, pkgs, ... }:
 let
+  gitpkgs = import <gitpkgs> {};
   commonPkgs = with pkgs; [
-    neovim
     xsel
   ];
-  goPkgs = with pkgs.goPackages; [
+  goPkgs = with gitpkgs.go16Packages; [
     go
     tools.bin
     godef.bin
@@ -20,8 +20,8 @@ let
   ];
 
 in {
-  nixpkgs.config.packageOverrides = pkgs: {
-    neovim = pkgs.neovim.override {
+  environment.systemPackages = commonPkgs ++ goPkgs ++ pythonPkgs ++ [
+    (pkgs.neovim.override {
       vimAlias = true;
       configure = {
         # add custom .vimrc lines like this:
@@ -171,7 +171,7 @@ in {
           " }}}
          '';
 
-#         vam.knownPlugins = pkgs.vimPlugins; # optional
+         vam.knownPlugins = gitpkgs.vimPlugins; # optional
          vam.pluginDictionaries = [ # full ducomentation at github.com/MarcWeber/vim-addon-manager
            "vim-addon-vim2nix"
            "youcompleteme"
@@ -192,14 +192,13 @@ in {
            "vimpreviewpandoc"
          ];
       };
-      extraPythonPackages = with pkgs.python2Packages; [
+      extraPythonPackages = with gitpkgs.python2Packages; [
         pandocfilters
         htmltreediff
         html5lib
         dbus
       ] ++ pythonPkgs;
       withPython3 = false;
-    };
-  };
-  environment.systemPackages = commonPkgs ++ goPkgs ++ pythonPkgs;
+    })
+  ];
 }
diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index 5360ba6..d608b3d 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
+{ config,
+  pkgs,
+  ... }:
 
 let
   gitpkgs = import <gitpkgs> {};
-
-in {
+in
+{
   nixpkgs.config = {
     allowBroken = false;
 
@@ -11,6 +13,7 @@ in {
       goPackages = pkgs.go16Packages;
       bluez = pkgs.bluez5;
       linuxPackages = pkgs.linuxPackages_latest;
+      #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; };
     };
 
     allowUnfree = true;
@@ -40,10 +43,9 @@ in {
   imports =
     [
       ../common/pkg/default.nix
-      (import ../common/pkg/neovim.nix { inherit config; pkgs = gitpkgs; })
+      ../common/pkg/neovim.nix
     ];
 
-
   environment.systemPackages = with pkgs; [
     androidsdk_4_4
 
@@ -61,6 +63,7 @@ in {
     firefox-wrapper
     chromium
 
+
     qpdfview
     thunderbird
     pidgin
@@ -70,9 +73,9 @@ in {
     x2goclient
     remmina
     teamviewer
-    gnome3.dconf # needed by virtmanager
-    virtmanager
     x11_ssh_askpass
+    gnome3.dconf # needed by virtmanager
+    #virtmanager
 
     spotify
     vlc
@@ -92,6 +95,6 @@ in {
     pythonFull
   ] ++ [
     gitpkgs.rkt
+    gitpkgs.virtmanager
   ];
-
 }