Merge branch 'master' into laptop

nvim/.config/nvim/after/plugin/lsp.lua

@@ -3,46 +3,47 @@ local lsp = require("lsp-zero")
 lsp.preset("recommended")
 
 lsp.ensure_installed({
-        "tsserver",
+	"tsserver",
-        "eslint",
+	"eslint",
-        "lua_ls",
+	"lua_ls",
-        "rust_analyzer",
+	"rust_analyzer",
-        "pyright",
+	"pyright",
+	"clangd",
 })
 
 local cmp = require("cmp")
 local cmp_select = { behavior = cmp.SelectBehavior.Select }
 local cmp_mappings = lsp.defaults.cmp_mappings({
-        ["<C-k>"] = cmp.mapping.select_prev_item(cmp_select),
+	["<C-k>"] = cmp.mapping.select_prev_item(cmp_select),
-        ["<C-j>"] = cmp.mapping.select_next_item(cmp_select),
+	["<C-j>"] = cmp.mapping.select_next_item(cmp_select),
-        -- ["<C-y>"] = cmp.mapping.confirm({ select = true }),
+	-- ["<C-y>"] = cmp.mapping.confirm({ select = true }),
-        ["<C-Space>"] = cmp.mapping.complete(),
+	["<C-Space>"] = cmp.mapping.complete(),
 })
 
 lsp.set_preferences({
-        sign_icons = {}
+	sign_icons = {}
 })
 
 lsp.setup_nvim_cmp({
-        mapping = cmp_mappings
+	mapping = cmp_mappings
 })
 
 lsp.on_attach(function(client, bufnr)
-        local opts = { buffer = bufnr, remap = false }
+	local opts = { buffer = bufnr, remap = false }
-
+
-        vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+	vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-        vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+	vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-        vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+	vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-        vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+	vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-        vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+	vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-        vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+	vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-        vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
+	vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-        vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
+	vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-        vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+	vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-        vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+	vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-        vim.keymap.set("n", "<A-g>", function()
+	vim.keymap.set("n", "<A-g>", function()
-                vim.lsp.buf.format { async = true }
+		vim.lsp.buf.format { async = true }
-        end, opts)
+	end, opts)
 end)
 
 lsp.setup()