diff --git a/environments/dev/go.nix b/environments/dev/go/default.nix
similarity index 81%
rename from environments/dev/go.nix
rename to environments/dev/go/default.nix
index 19833ff..e67468d 100644
--- a/environments/dev/go.nix
+++ b/environments/dev/go/default.nix
@@ -68,7 +68,7 @@ let
       gox.bin
       #ginkgo ginkgo.bin
       #gomega
-      ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
+#      ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
 #      ( import ./neovim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
   ];
 
@@ -77,22 +77,13 @@ in pkgs.stdenv.mkDerivation {
   buildInputs = extraBuildInputs ++ buildInputs;
   shellHook = ''
     goname=${go.version}_$name
-    setPS1 $goname
+    # FIXME: setPS1 $goname
     export GOROOT=${go}/share/go
     export GOPATH="$HOME/.gopath_$goname"
     export PATH="$HOME/.gopath_$goname/bin:$PATH"
     unset name
     unset SSL_CERT_FILE
 
-    go get -u github.com/Masterminds/glide
-    go get -u github.com/sgotti/glide-vc
-    go get -u github.com/alecthomas/gometalinter
-    go get -u github.com/golang/lint/golint
-    go get -u github.com/rogpeppe/godef
-    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}
   '';
 }
diff --git a/environments/dev/neovim-go.nix b/environments/dev/go/neovim-go.nix
similarity index 100%
rename from environments/dev/neovim-go.nix
rename to environments/dev/go/neovim-go.nix