nixpkgs/neovim: switch to typescript.nvim

Things currently double import on autocomplete probably due to
nvim-lsp-ts-utils so we're moving to typescript.nvim that replaces it.

.config/nixpkgs/neovim/lsp.lua

@@ -38,63 +38,26 @@ elseif vim.fn.executable("gofmt") == 1 then
 end
 
 if vim.fn.executable("node_modules/.bin/tsc") == 1 then
-  -- this provides auto-import on completion, among other things
-  local ts_utils = require("nvim-lsp-ts-utils")
-
-  nvim_lsp.tsserver.setup({
-    init_options = ts_utils.init_options,
-    flags = {
-      debounce_text_changes = 150,
-    },
-    on_attach = function(client, bufnr)
-      -- mark tsserver as not having formatting available as we rely on
-      -- null-ls/eslint for that and having both available makes nvim ask us
-      -- which LS to use everytime we format
-      client.resolved_capabilities.document_formatting = false
-      client.resolved_capabilities.document_range_formatting = false
-
-      -- settings here are buffer-local so has to be run on_attach
-      ts_utils.setup({
-        debug = false,
-        disable_commands = false,
-        enable_import_on_completion = true,
-
-        -- import all
-        import_all_timeout = 5000, -- ms
-        -- lower numbers = higher priority
-        import_all_priorities = {
-            same_file = 1, -- add to existing import statement
-            local_files = 2, -- git files or files with relative path markers
-            buffer_content = 3, -- loaded buffer content
-            buffers = 4, -- loaded buffer names
-        },
-        import_all_scan_buffers = 100,
-        import_all_select_source = false,
-
-        -- filter diagnostics
-        filter_out_diagnostics_by_severity = {},
-        filter_out_diagnostics_by_code = {},
-
-        -- inlay hints
-        auto_inlay_hints = false,
-        inlay_hints_highlight = "Comment",
-
-        -- update imports on file move
-        update_imports_on_move = false,
-        require_confirmation_on_move = false,
-        watch_dir = nil,
-      })
-
-      -- required to fix code action ranges and filter diagnostics
-      ts_utils.setup_client(client)
-
-      on_attach(client, bufnr)
-
-      -- override mappings for typescript
-      local opts = { silent = true, buffer = bufnr }
-      -- exclude import statements from reference search (may have false positives)
-      vim.keymap.set('n', 'gr', '<cmd>Telescope lsp_references default_text=!import\\ <CR>', opts)
-    end,
+  require('typescript').setup({
+    server = {
+      flags = {
+        debounce_text_changes = 150,
+      },
+      on_attach = function(client, bufnr)
+        -- mark tsserver as not having formatting available as we rely on
+        -- null-ls/eslint for that and having both available makes nvim ask us
+        -- which LS to use everytime we format
+        client.resolved_capabilities.document_formatting = false
+        client.resolved_capabilities.document_range_formatting = false
+
+        on_attach(client, bufnr)
+
+        -- override mappings for typescript
+        local opts = { silent = true, buffer = bufnr }
+        -- exclude import statements from reference search (may have false positives)
+        vim.keymap.set('n', 'gr', '<cmd>Telescope lsp_references default_text=!import\\ <CR>', opts)
+      end
+    }
   })
 end
 

.config/nixpkgs/neovim/neovim.nix

@@ -5,9 +5,22 @@
 , ripgrep
 , nodePackages
 , vimPlugins
+, vimUtils
+, fetchFromGitHub
 , withPlayground ? false
 }:
 let
+  typescript-nvim = vimUtils.buildVimPluginFrom2Nix {
+    name = "typescript-nvim";
+    src = fetchFromGitHub {
+      owner = "jose-elias-alvarez";
+      repo = "typescript.nvim";
+      rev = "e4b780d6b686585cb345e16d444fd3d303da91bb";
+      sha256 = "sha256-7ZL7dqYUWW+JDeUjR5/ipnESpN/lG2HFz9BYgVNpJfk=";
+    };
+    dependencies = ["plenary-nvim"];
+  };
+
   extra-treesitter-textobjects = writeTextFile {
     name = "extra-treesitter-textobjects";
     destination = "/after/queries/javascript/textobjects.scm";
@@ -70,7 +83,7 @@ neovim.override {
         extra-treesitter-textobjects
 
         nvim-lspconfig
-        nvim-lsp-ts-utils
+        typescript-nvim
         null-ls-nvim
         fidget-nvim
       ] ++ lib.optionals withPlayground [