*: adapt to new Go structure

configuration/common/pkg/neovim.nix

@@ -4,11 +4,13 @@ let
   commonPkgs = with pkgs; [
     xsel
   ];
-  goPkgs = with pkgs.go16Packages; [
-    go
-    tools.bin
-    godef.bin
-    godep.bin
+
+  goPkgs = with gitpkgs; [
+    go_1_6
+    gotools.bin
+#    godef.bin
+    godep
+#    go-errcheck.bin
   ];
   pythonPkgs = with pkgs.python2Packages; [
     blockdiag
@@ -63,11 +65,6 @@ in {
           set expandtab
           "set textwidth=80
 
-          " GoDef mappings
-          au FileType go nmap <Leader>gds <Plug>(go-def-split)
-          au FileType go nmap <Leader>gdv <Plug>(go-def-vertical)
-          au FileType go nmap <Leader>gdt <Plug>(go-def-tab)
-
           let g:tagbar_type_go = {
             \ 'ctagstype' : 'go',
             \ 'kinds'     : [
@@ -115,7 +112,6 @@ in {
             \ 'file': '\v\.(exe|so|dll)$$',
             \ }
 
-          let g:go_fmt_command = "goimports"
 
           "au BufRead,BufNewFile *.txt,*.md,*.markdown setlocal spell spelllang=de_de,en_us
 
@@ -169,6 +165,21 @@ in {
               setlocal autoindent sw=2 et tabstop=2 shiftwidth=2 softtabstop=2
           augroup END
           " }}}
+
+          " vim-go {
+          let g:go_highlight_functions = 1
+          let g:go_highlight_methods = 1
+          let g:go_highlight_structs = 1
+          let g:go_highlight_interfaces = 1
+          let g:go_highlight_operators = 1
+          let g:go_highlight_build_constraints = 1
+"          let g:go_fmt_command = "goimports"
+
+          au FileType go nmap <Leader>gds <Plug>(go-def-split)
+          au FileType go nmap <Leader>gdv <Plug>(go-def-vertical)
+          au FileType go nmap <Leader>gdt <Plug>(go-def-tab)
+          " }
+
          '';
 
          vam.knownPlugins = gitpkgs.vimPlugins; # optional
@@ -179,18 +190,17 @@ in {
            "vim-addon-nix"
            "ctrlp"
            "vim-go"
-           "syntastic"
+#           "syntastic"
            "tagbar"
            "vim-css-color"
            "rainbow_parentheses"
            "vim-colorschemes"
            "vim-colorstepper"
            "vim-signify"
-           "vim-pandoc"
-           "vim-pandoc-syntax"
-           "vim-pandoc-after"
-           "vimpreviewpandoc"
-           "rust-vim"
+#           "vim-pandoc"
+#           "vim-pandoc-syntax"
+#           "vim-pandoc-after"
+#           "vimpreviewpandoc"
          ];
       };
       extraPythonPackages = with gitpkgs.python2Packages; [