nixpkgs/neovim: use tsserver LSP outside typescript projects

.config/nixpkgs/neovim/lsp.lua

@@ -54,17 +54,7 @@ if vim.fn.executable("deno") == 1 then
   nvim_lsp.denols.setup({
     on_attach = on_attach,
   });
-end
-
-if vim.fn.executable("gopls") == 1 then
-  nvim_lsp.gopls.setup({
-    on_attach = on_attach,
-  });
-elseif vim.fn.executable("gofmt") == 1 then
-  table.insert(null_ls_sources, null_ls.builtins.formatting.gofmt)
-end
-
-if vim.fn.executable("node_modules/.bin/tsc") == 1 then
+else
   require('typescript').setup({
     server = {
       flags = {
@@ -85,9 +75,14 @@ if vim.fn.executable("node_modules/.bin/tsc") == 1 then
       end
     }
   })
+end
 
-  -- set compiler for :make
-  vim.cmd("compiler! tsc")
+if vim.fn.executable("gopls") == 1 then
+  nvim_lsp.gopls.setup({
+    on_attach = on_attach,
+  });
+elseif vim.fn.executable("gofmt") == 1 then
+  table.insert(null_ls_sources, null_ls.builtins.formatting.gofmt)
 end
 
 if vim.fn.executable("solargraph") == 1 then

.config/nixpkgs/neovim/neovim.nix

@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, writeShellScriptBin
 , writeTextFile
 , neovim-unwrapped
 , makeWrapper
@@ -32,11 +33,19 @@ let
       (array . (_) @parameter.inner ",")
     '';
   };
+  tsc = writeShellScriptBin "tsc" ''
+    if [ -x "./node_modules/.bin/tsc" ]; then
+      exec ./node_modules/.bin/tsc "$@"
+    else
+      exec ${node-lsp}/lib/node_modules/node-lsp/node_modules/.bin/tsc "$@"
+    fi
+  '';
 
   extraPath = [
     fd
     ripgrep
     node-lsp
+    tsc
   ];
 
   nixpkgsPlugins =

.config/nixpkgs/neovim/node-lsp/default.nix

@@ -8,5 +8,5 @@ buildNpmPackage {
 
   dontNpmBuild = true;
 
-  npmDepsHash = "sha256-oWgWXsLFJHnSpO2FVNg+qsGWs3xoOQ+LOmRdI6GoxOc=";
+  npmDepsHash = "sha256-KAG5uZWLL03O3br8Gf1I4LziujL1rpZ5jLUTPasXbxU=";
 }

.config/nixpkgs/neovim/node-lsp/package-lock.json

@@ -8,6 +8,7 @@
       "name": "node-lsp",
       "version": "0.0.0",
       "dependencies": {
+        "typescript": "^4.9.5",
         "typescript-language-server": "^3.0.2",
         "vscode-langservers-extracted": "^4.5.0"
       },

.config/nixpkgs/neovim/node-lsp/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "dependencies": {
     "vscode-langservers-extracted": "^4.5.0",
+    "typescript": "^4.9.5",
     "typescript-language-server": "^3.0.2"
   },
   "bin": {

.config/nixpkgs/neovim/plugins.lua

@@ -148,5 +148,4 @@ require('treesj').setup({
 })
 
 -- typescript-vim compiler options
-vim.g.typescript_compiler_binary = 'node_modules/.bin/tsc'
 vim.g.typescript_compiler_options = '--incremental --noEmit'