vim: add go tools

.editorconfig

@@ -1,10 +1,10 @@
+[*]
+indent_style = tab
+
 [*.{nix,yaml}]
 indent_style = space
 indent_size = 2
 
-[*.py]
+[*.{py,sh}]
 indent_style = space
 indent_size = 4
-
-[*.{json,lua}]
-indent_style = tab

modules/sean.nix

@@ -2,7 +2,8 @@
 {
   environment.variables.EDITOR = "nvim";
   environment.systemPackages = [
-    pkgs.bck-nvim
+    pkgs.bck-nvim-base
+    pkgs.bck-nvim-tools
   ];
 
   users.users.sean = {

pkgs/bck-nvim-base/default.nix

@@ -1,17 +1,8 @@
 { lib
+, extraBinPaths ? [ ]
 , neovim-unwrapped
 , vimPlugins
 , wrapNeovim
-
-  # LSP
-, black
-, efm-langserver
-, lua-language-server
-, nil
-, nodePackages
-, pyright
-, vscode-langservers-extracted
-, yaml-language-server
 }:
 
 let
@@ -22,17 +13,7 @@ let
 
   extraPath = lib.concatLines (map
     (p: "let $PATH .= ':${p}/bin'")
-    [
+    (extraBinPaths)
-      black
-      efm-langserver
-      lua-language-server
-      nil
-      nodePackages.prettier
-      nodePackages.typescript-language-server
-      pyright
-      vscode-langservers-extracted
-      yaml-language-server
-    ]
   );
 
 in

pkgs/bck-nvim-base/lua/5-lsp.lua

@@ -16,6 +16,11 @@ lspconfig.lua_ls.setup({
 	}
 })
 
+----------------------------------------------------------------
+lspconfig.gopls.setup({
+	capabilities = capabilities,
+})
+
 ----------------------------------------------------------------
 lspconfig.pyright.setup({
 	capabilities = capabilities,

pkgs/bck-nvim-tools.nix

@@ -0,0 +1,41 @@
+{ symlinkJoin
+, runCommand
+
+, black
+, efm-langserver
+, errcheck
+, go
+, gopls
+, lua-language-server
+, nil
+, nodePackages
+, pyright
+, vscode-langservers-extracted
+, yaml-language-server
+}:
+
+let
+  symlinkBin = path: runCommand "symlinkBin" { } ''
+    mkdir -p $out/bin
+    ln -s "${path}" $out/bin/
+  '';
+
+in
+symlinkJoin {
+  name = "bck-nvim-tools";
+  paths = [
+    black
+    efm-langserver
+    errcheck
+    go
+    gopls
+    lua-language-server
+    nil
+    pyright
+    vscode-langservers-extracted
+    yaml-language-server
+
+    (symlinkBin "${nodePackages.prettier}/bin/prettier")
+    (symlinkBin "${nodePackages.typescript-language-server}/bin/typescript-language-server")
+  ];
+}

pkgs/bck-nvim.nix

@@ -0,0 +1,7 @@
+{ callPackage }:
+
+callPackage ./bck-nvim-base {
+  extraBinPaths = [
+    (callPackage ./bck-nvim-tools.nix { })
+  ];
+}