.editorconfig

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

modules/sean.nix

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

pkgs/bck-nvim-tools.nix

@@ -1,41 +0,0 @@
-{ 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

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

pkgs/bck-nvim/default.nix

@@ -1,8 +1,17 @@
 { lib
-, extraBinPaths ? [ ]
 , neovim-unwrapped
 , vimPlugins
 , wrapNeovim
+
+  # LSP
+, black
+, efm-langserver
+, lua-language-server
+, nil
+, nodePackages
+, pyright
+, vscode-langservers-extracted
+, yaml-language-server
 }:
 
 let
@@ -13,7 +22,17 @@ 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/lua/5-lsp.lua

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