localsdk and switch to magazine cmp

davidosomething · Oct 24, 2024 · e2ef3dc · e2ef3dc
1 parent 5df2927
commit e2ef3dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
@@ -68,5 +68,8 @@
   "typescript.preferGoToSourceDefinition": true,
   "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
   "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": true,
-  "tsserver.disableAutomaticTypeAcquisition": true
+  "tsserver.disableAutomaticTypeAcquisition": true,
+
+  // coc-tsserver still uses old version of typescript, so use local one instead
+  "tsserver.useLocalTsdk": true
 }
diff --git a/nvim/lua/dko/plugins/completion.lua b/nvim/lua/dko/plugins/completion.lua
@@ -30,9 +30,13 @@ local nhc_ok, nhc
 local cmp_dependencies = {
   { "dcampos/cmp-snippy", dependencies = { "dcampos/nvim-snippy" } },
 
-  "hrsh7th/cmp-buffer",
-  "hrsh7th/cmp-cmdline",
-  "hrsh7th/cmp-nvim-lsp",
+  -- "hrsh7th/cmp-nvim-lsp",
+  { "iguanacucumber/mag-nvim-lsp", name = "cmp-nvim-lsp", opts = {} },
+  -- { "iguanacucumber/mag-nvim-lua", name = "cmp-nvim-lua" },
+  -- "hrsh7th/cmp-buffer",
+  { "iguanacucumber/mag-buffer", name = "cmp-buffer" },
+  -- "hrsh7th/cmp-cmdline",
+  { "iguanacucumber/mag-cmdline", name = "cmp-cmdline" },
   "hrsh7th/cmp-nvim-lsp-signature-help",
   "hrsh7th/cmp-path",