update: lsp config

10 files changed, 56 insertions, 57 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 008957e..c1ef7d3 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -10,6 +10,7 @@ require("cole.plugins.nvim-cmp")
 require("cole.plugins.lsp.mason")
 require("cole.plugins.lsp.lspsaga")
 require("cole.plugins.lsp.null-ls")
+require("cole.plugins.lsp.lspconfig")
 require("cole.plugins.autopairs")
 require("cole.plugins.treesitter")
 require("cole.plugins.gitsigns")
diff --git a/.config/nvim/lua/cole/core/keymaps.lua b/.config/nvim/lua/cole/core/keymaps.lua
index 5ea6d9f..6d84f5a 100644
--- a/.config/nvim/lua/cole/core/keymaps.lua
+++ b/.config/nvim/lua/cole/core/keymaps.lua
@@ -27,7 +27,7 @@ keymap.set("n", "<leader>se", "<C-w>=") -- make split windows equal width & heig
 keymap.set("n", "<leader>sx", ":close<CR>") -- close current split window
 
 -- terminal
-vim.keymap.set("t", "<esc>", [[<C-\><C-n>]], opts)
+vim.keymap.set("t", "<esc>", [[<C-\><C-n>]])
 
 -- toggle-terminal
 keymap.set("n", "<leader>tt", ":ToggleTerm dir=git_dir<CR>")
diff --git a/.config/nvim/lua/cole/plugins-setup.lua b/.config/nvim/lua/cole/plugins-setup.lua
index 94dc404..df5be34 100644
--- a/.config/nvim/lua/cole/plugins-setup.lua
+++ b/.config/nvim/lua/cole/plugins-setup.lua
@@ -58,7 +58,10 @@ return packer.startup(function(use)
 
 	-- fuzzy finding w/ telescope
 	use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" }) -- dependency for better sorting performance
-	use({ "nvim-telescope/telescope.nvim", branch = "0.1.x" }) -- fuzzy finder
+	use({
+		"nvim-telescope/telescope.nvim",
+		branch = "0.1.x",
+	}) -- fuzzy finder
 
 	-- autocompletion
 	use("hrsh7th/nvim-cmp") -- completion plugin
diff --git a/.config/nvim/lua/cole/plugins/comment.lua b/.config/nvim/lua/cole/plugins/comment.lua
index 80a2672..89a3d62 100644
--- a/.config/nvim/lua/cole/plugins/comment.lua
+++ b/.config/nvim/lua/cole/plugins/comment.lua
@@ -1,6 +1,6 @@
 local setup, comment = pcall(require, "Comment")
-if not setup then 
-    return 
+if not setup then
+	return
 end
 
 comment.setup()
diff --git a/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua b/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
index 622b3b4..5624356 100644
--- a/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
+++ b/.config/nvim/lua/cole/plugins/lsp/lspconfig.lua
@@ -19,7 +19,7 @@ local on_attach = function(client, bufnr)
 
 	-- set keybinds
 	keymap.set("n", "gf", "<cmd>Lspsaga lsp_finder<CR>", opts) -- show definition, references
-	keymap.set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts) -- got to declaration
+	keymap.set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts) -- go to declaration
 	keymap.set("n", "gd", "<cmd>Lspsaga peek_definition<CR>", opts) -- see definition and make edits in window
 	keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) -- go to implementation
 	keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<CR>", opts) -- see available code actions
@@ -47,12 +47,10 @@ end
 lspconfig["clangd"].setup({
 	capabilities = capabilities,
 	on_attach = on_attach,
-})
-
--- configure cmake server
-lspconfig["cmake"].setup({
-	capabilities = capabilities,
-	on_attach = on_attach,
+	cmd = {
+		"clangd",
+		"--offset-encoding=utf-16",
+	},
 })
 
 -- configure arduino server
diff --git a/.config/nvim/lua/cole/plugins/lsp/mason.lua b/.config/nvim/lua/cole/plugins/lsp/mason.lua
index 1b097b1..a8e6d46 100644
--- a/.config/nvim/lua/cole/plugins/lsp/mason.lua
+++ b/.config/nvim/lua/cole/plugins/lsp/mason.lua
@@ -32,7 +32,6 @@ mason_lspconfig.setup({
 	ensure_installed = {
 		"lua_ls",
 		"clangd",
-		"cmake",
 		"arduino_language_server",
 		"ltex",
 		"jedi_language_server",
@@ -46,8 +45,8 @@ mason_null_ls.setup({
 	ensure_installed = {
 		"black", -- python code formatter
 		"stylua", -- lua formatter
-		"clang-format", -- cpp formatter
 		"cpplint", -- cpp linter
+		"codespell", -- spellings linter
 	},
 	-- auto-install configured formatters & linters (with null-ls)
 	automatic_installation = true,
diff --git a/.config/nvim/lua/cole/plugins/lsp/null-ls.lua b/.config/nvim/lua/cole/plugins/lsp/null-ls.lua
index f6e2d9d..5432914 100644
--- a/.config/nvim/lua/cole/plugins/lsp/null-ls.lua
+++ b/.config/nvim/lua/cole/plugins/lsp/null-ls.lua
@@ -15,12 +15,8 @@ local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 null_ls.setup({
 	-- setup formatters & linters
 	sources = {
-		-- might install pyre as linter
-		-- turned off cpplint
 		formatting.black, -- python formatter
 		formatting.stylua, -- lua formatter
-		formatting.clang_format, -- cpp formatter
-		diagnostics.pyre, -- python linter
 		diagnostics.cpplint, -- cpp linter
 	},
 
diff --git a/.config/nvim/lua/cole/plugins/lualine.lua b/.config/nvim/lua/cole/plugins/lualine.lua
index 37718da..99425cd 100644
--- a/.config/nvim/lua/cole/plugins/lualine.lua
+++ b/.config/nvim/lua/cole/plugins/lualine.lua
@@ -1,6 +1,6 @@
 local status, lualine = pcall(require, "lualine")
-if not status then 
-    return 
-end 
+if not status then
+	return
+end
 
 lualine.setup()
diff --git a/.config/nvim/lua/cole/plugins/nvim-cmp.lua b/.config/nvim/lua/cole/plugins/nvim-cmp.lua
index 075ea60..2730814 100644
--- a/.config/nvim/lua/cole/plugins/nvim-cmp.lua
+++ b/.config/nvim/lua/cole/plugins/nvim-cmp.lua
@@ -1,17 +1,17 @@
 local cmp_status, cmp = pcall(require, "cmp")
-if not cmp_status then 
-    return 
-end 
+if not cmp_status then
+	return
+end
 
 local luasnip_status, luasnip = pcall(require, "luasnip")
-if not luasnip_status then 
-    return 
-end 
+if not luasnip_status then
+	return
+end
 
 -- import lspkind plugin safely
 local lspkind_status, lspkind = pcall(require, "lspkind")
 if not lspkind_status then
-  return
+	return
 end
 
 -- load vs-code like snippets from plugins (e.g. friendly-snippets)
@@ -20,32 +20,34 @@ require("luasnip/loaders/from_vscode").lazy_load()
 vim.opt.completeopt = "menu,menuone,noselect"
 
 cmp.setup({
-  snippet = {
-    expand = function(args)
-      luasnip.lsp_expand(args.body)
-    end,
-  },
-  mapping = cmp.mapping.preset.insert({
-    ["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
-    ["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
-    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
-    ["<C-e>"] = cmp.mapping.abort(), -- close completion window
-    ["<CR>"] = cmp.mapping.confirm({ select = false }),
-  }),
-  -- sources for autocompletion
-  sources = cmp.config.sources({
-    { name = "nvim_lsp" }, -- lsp
-    { name = "luasnip" }, -- snippets
-    { name = "buffer" }, -- text within current buffer
-    { name = "path" }, -- file system paths
-  }),
-  -- configure lspkind for vs-code like icons
-  formatting = {
-    format = lspkind.cmp_format({
-      maxwidth = 50,
-      ellipsis_char = "...",
-    }),
-  },
+	snippet = {
+		expand = function(args)
+			luasnip.lsp_expand(args.body)
+		end,
+	},
+	mapping = cmp.mapping.preset.insert({
+		["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
+		["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
+		["<C-b>"] = cmp.mapping.scroll_docs(-4),
+		["<C-f>"] = cmp.mapping.scroll_docs(4),
+		["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
+		["<C-e>"] = cmp.mapping.abort(), -- close completion window
+		["<CR>"] = cmp.mapping.confirm({ select = false }),
+	}),
+	-- sources for autocompletion
+	sources = cmp.config.sources({
+		{ name = "nvim_lsp" }, -- lsp
+		{ name = "luasnip" }, -- snippets
+		{ name = "buffer" }, -- text within current buffer
+		{ name = "path" }, -- file system paths
+		{ name = "spell" }, -- spell checker
+		{ name = "treesitter" },
+	}),
+	-- configure lspkind for vs-code like icons
+	formatting = {
+		format = lspkind.cmp_format({
+			maxwidth = 50,
+			ellipsis_char = "...",
+		}),
+	},
 })
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 3f61147..164b30f 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -217,7 +217,7 @@ _G.packer_plugins = {
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["toggleterm.nvim"] = {
-    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14autochdir\1\14direction\15horizontal\tsize\3\15\nsetup\15toggleterm\frequire\0" },
+    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14direction\15horizontal\tsize\3\15\14autochdir\1\nsetup\15toggleterm\frequire\0" },
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/toggleterm.nvim",
     url = "https://github.com/akinsho/toggleterm.nvim"
@@ -247,7 +247,7 @@ _G.packer_plugins = {
 time([[Defining packer_plugins]], false)
 -- Config for: toggleterm.nvim
 time([[Config for toggleterm.nvim]], true)
-try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14autochdir\1\14direction\15horizontal\tsize\3\15\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim")
+try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14direction\15horizontal\tsize\3\15\14autochdir\1\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim")
 time([[Config for toggleterm.nvim]], false)
 -- Load plugins in order defined by `after`
 time([[Sequenced loading]], true)