dev/go: use configured vim

derivations/dev/go.nix

@@ -1,9 +1,9 @@
-{
-pkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
-name ? "generic",
-version,
-extraBuildInputs ? [],
-extraShellHook ? ""
+{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {}
+, pkgs ? gitpkgs
+, name ? "generic"
+, version
+, extraBuildInputs ? []
+, extraShellHook ? ""
 }:
 let
   go = builtins.getAttr "go_${version}" pkgs;
@@ -14,14 +14,14 @@ let
       go
       gotools
       #gotools.bin
-      gocode
-      gocode.bin
+      #gocode.bin
       #godef godef.bin
       godep
       #godep.bin
       gox.bin
       #ginkgo ginkgo.bin
       #gomega
+      (import ./vim-go.nix{inherit pkgs;})
   ];
 
 in pkgs.stdenv.mkDerivation {
@@ -44,6 +44,7 @@ in pkgs.stdenv.mkDerivation {
     go get -u github.com/kisielk/errcheck
     go get -u github.com/jstemmer/gotags
     go get -u github.com/klauspost/asmfmt/cmd/asmfmt
+    go get -u github.com/nsf/gocode
     ${extraShellHook}
   '';
 }