1 files changed, 20 insertions, 27 deletions

diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index cc0136b..2f785a6 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -59,44 +59,31 @@ let g:mundo_right=1
 let g:mundo_width=40
 let g:mundo_preview_height=30
 
-" Autopairs
-" let b:autopairs_enabled=1
-" let g:AutoPairsMapBS=1
-" let g:AutoPairsPrefix='<M-P>'
-
-" Treesitter
 lua << EOF
+
 require('nvim-treesitter.configs').setup {
-  ensure_installed = { "c", "cpp", "lua", "vim", "vimdoc", "typescript", "python" },
+  ensure_installed = { "c", "cpp", "lua", "vim", "vimdoc", "typescript", "python", "html" },
   sync_install = false,
   auto_install = false,
   highlight = {
     enable = true,
-    disable = { "html" },
     additional_vim_regex_highlighting = true,
   },
   indent = {
-    enable = false,
-  },
-  autotag = {
     enable = true,
   }
 }
-EOF
 
-lua << EOF
-require('nvim-autopairs').setup {}
-require('nvim-ts-autotag').setup {}
-EOF
+require('nvim-autopairs').setup()
+require('nvim-ts-autotag').setup()
 
-" LSP
-lua << EOF
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 local lspconfig = require('lspconfig')
 
 lspconfig.clangd.setup{
-  cmd = { 'clangd15' },
+  cmd = { 'clangd18' },
   capabilities = capabilities
 }
 
@@ -104,18 +91,14 @@ lspconfig.lua_ls.setup {
   settings = {
     Lua = {
       runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
         version = 'LuaJIT',
       },
       diagnostics = {
-        -- Get the language server to recognize the `vim` global
         globals = {'vim'},
       },
       workspace = {
-        -- Make the server aware of Neovim runtime files
         library = vim.api.nvim_get_runtime_file("", true),
       },
-      -- Do not send telemetry data containing a randomized but unique identifier
       telemetry = {
         enable = false,
       },
@@ -124,6 +107,10 @@ lspconfig.lua_ls.setup {
   capabilities = capabilities
 }
 
+lspconfig.cssls.setup{
+  capabilities = capabilities
+}
+
 lspconfig.html.setup{
   capabilities = capabilities
 }
@@ -135,13 +122,13 @@ lspconfig.tsserver.setup{
 lspconfig.vimls.setup{
   capabilities = capabilities
 }
-EOF
 
-lua << EOF
+lspconfig.jsonls.setup{
+  capabilities = capabilities
+}
+
 require('gitsigns').setup()
-EOF
 
-lua << EOF
 require("luasnip.loaders.from_vscode").lazy_load()
 
 local cmp = require('cmp')
@@ -170,5 +157,11 @@ cmp.setup({
     { name = 'buffer' },
   })
 })
+
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+cmp.event:on(
+  'confirm_done',
+  cmp_autopairs.on_confirm_done()
+)
 EOF