revamped nvim config with lsp.zero
This commit is contained in:
Rahsheen Porter
parent
b32fa96788
commit
1f2f336b64
9 changed files with 283 additions and 350 deletions
21
.config/nvim/after/plugin/fugitive.lua
Normal file
21
.config/nvim/after/plugin/fugitive.lua
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
vim.keymap.set("n", "<leader>gs", ":G<CR>")
|
||||
vim.keymap.set("n", "<leader>gh", ":diffget //3<CR>")
|
||||
vim.keymap.set("n", "<leader>gu", ":diffget //2<CR>")
|
||||
vim.keymap.set("n", "<leader>gc", ":GCheckout<CR>")
|
||||
vim.keymap.set("n", "<leader>ga", ":G add %:p<CR><CR>")
|
||||
vim.keymap.set("n", "<leader>gc", ":G commit -v -q<CR>")
|
||||
vim.keymap.set("n", "<leader>gt", ":G commit -v -q %:p<CR>")
|
||||
vim.keymap.set("n", "<leader>gca", ":G commit --amend --no-edit<CR>")
|
||||
vim.keymap.set("n", "<leader>gff", ":G ff<CR>")
|
||||
vim.keymap.set("n", "<leader>gfo", ":G fetch origin<CR>")
|
||||
vim.keymap.set("n", "<leader>gd", ":Gdiff<CR>")
|
||||
vim.keymap.set("n", "<leader>ge", ":Gedit<CR>")
|
||||
vim.keymap.set("n", "<leader>gr", ":Gread<CR>")
|
||||
vim.keymap.set("n", "<leader>gw", ":Gwrite<CR><CR>")
|
||||
vim.keymap.set("n", "<leader>gl", ":silent! Glog<CR>:bot copen<CR>")
|
||||
vim.keymap.set("n", "<leader>gp", ":Ggrep<Space>")
|
||||
vim.keymap.set("n", "<leader>gm", ":Gmove<Space>")
|
||||
-- vim.keymap.set("n", "<leader>gb", ":G branch<Space>")
|
||||
vim.keymap.set("n", "<leader>go", ":G checkout<Space>")
|
||||
vim.keymap.set("n", "<leader>gps", ":Dispatch! git push<CR>")
|
||||
vim.keymap.set("n", "<leader>gpl", ":Dispatch! git pull<CR>")
|
||||
|
|
@ -1,245 +1,112 @@
|
|||
local lsp = require("lsp-zero")
|
||||
|
||||
lsp.preset("recommended")
|
||||
|
||||
lsp.ensure_installed({
|
||||
"tsserver",
|
||||
"eslint",
|
||||
"sumneko_lua",
|
||||
"rust_analyzer",
|
||||
})
|
||||
|
||||
-- see documentation of null-null-ls for more configuration options!
|
||||
local mason_nullls = require("mason-null-ls")
|
||||
mason_nullls.setup({
|
||||
automatic_installation = true,
|
||||
automatic_setup = true,
|
||||
})
|
||||
mason_nullls.setup_handlers({})
|
||||
|
||||
local Remap = require("rahcodes.keymap")
|
||||
local nnoremap = Remap.nnoremap
|
||||
local inoremap = Remap.inoremap
|
||||
|
||||
local sumneko_root_path = "/usr/lib/lua-language-server"
|
||||
local sumneko_binary = "/usr/local/bin/lua-language-server"
|
||||
|
||||
-- Setup nvim-cmp.
|
||||
local cmp = require("cmp")
|
||||
local source_mapping = {
|
||||
youtube = "[Suck it YT]",
|
||||
buffer = "[Buffer]",
|
||||
nvim_lsp = "[LSP]",
|
||||
nvim_lua = "[Lua]",
|
||||
-- cmp_tabnine = "[TN]",
|
||||
path = "[Path]",
|
||||
}
|
||||
local lspkind = require("lspkind")
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
-- For `vsnip` user.
|
||||
-- vim.fn["vsnip#anonymous"](args.body)
|
||||
|
||||
-- For `luasnip` user.
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
|
||||
-- For `ultisnips` user.
|
||||
-- vim.fn["UltiSnips#Anon"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-u>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
|
||||
formatting = {
|
||||
format = function(entry, vim_item)
|
||||
vim_item.kind = lspkind.presets.default[vim_item.kind]
|
||||
local menu = source_mapping[entry.source.name]
|
||||
-- if entry.source.name == "cmp_tabnine" then
|
||||
-- if entry.completion_item.data ~= nil and entry.completion_item.data.detail ~= nil then
|
||||
-- menu = entry.completion_item.data.detail .. " " .. menu
|
||||
-- end
|
||||
-- vim_item.kind = ""
|
||||
-- end
|
||||
vim_item.menu = menu
|
||||
return vim_item
|
||||
end,
|
||||
},
|
||||
|
||||
sources = {
|
||||
-- tabnine completion? yayaya
|
||||
-- { name = "cmp_tabnine" },
|
||||
|
||||
{ name = "nvim_lsp" },
|
||||
|
||||
-- For vsnip user.
|
||||
-- { name = 'vsnip' },
|
||||
|
||||
-- For luasnip user.
|
||||
{ name = "luasnip" },
|
||||
|
||||
-- For ultisnips user.
|
||||
-- { name = 'ultisnips' },
|
||||
|
||||
{ name = "buffer" },
|
||||
|
||||
{ name = "youtube" },
|
||||
},
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
local cmp_mappings = lsp.defaults.cmp_mappings({
|
||||
["<C-u>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
|
||||
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
|
||||
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
})
|
||||
lsp.setup_nvim_cmp({
|
||||
mapping = cmp_mappings,
|
||||
})
|
||||
|
||||
--[[
|
||||
local tabnine = require("cmp_tabnine.config")
|
||||
tabnine:setup({
|
||||
max_lines = 1000,
|
||||
max_num_results = 20,
|
||||
sort = true,
|
||||
run_on_every_keystroke = true,
|
||||
snippet_placeholder = "..",
|
||||
})
|
||||
]]
|
||||
--
|
||||
|
||||
local function config(_config)
|
||||
return vim.tbl_deep_extend("force", {
|
||||
on_attach = function()
|
||||
nnoremap("gD", function()
|
||||
vim.lsp.buf.definition()
|
||||
end)
|
||||
nnoremap("gd", function()
|
||||
vim.lsp.buf.definition()
|
||||
end)
|
||||
nnoremap("K", function()
|
||||
vim.lsp.buf.hover()
|
||||
end)
|
||||
nnoremap("gi", function()
|
||||
vim.lsp.buf.implementation()
|
||||
end)
|
||||
nnoremap("<leader>wa", function()
|
||||
vim.lsp.buf.add_workspace_folder()
|
||||
end)
|
||||
nnoremap("<leader>wr", function()
|
||||
vim.lsp.buf.remove_workspace_folder()
|
||||
end)
|
||||
nnoremap("<leader>wl", function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end)
|
||||
nnoremap("<leader>vws", function()
|
||||
vim.lsp.buf.workspace_symbol()
|
||||
end)
|
||||
nnoremap("<leader>vd", function()
|
||||
vim.diagnostic.open_float()
|
||||
end)
|
||||
nnoremap("[d", function()
|
||||
vim.diagnostic.goto_next()
|
||||
end)
|
||||
nnoremap("]d", function()
|
||||
vim.diagnostic.goto_prev()
|
||||
end)
|
||||
nnoremap("<leader>ca", function()
|
||||
vim.lsp.buf.code_action()
|
||||
end)
|
||||
nnoremap("<leader>vco", function()
|
||||
vim.lsp.buf.code_action({
|
||||
filter = function(code_action)
|
||||
if not code_action or not code_action.data then
|
||||
return false
|
||||
end
|
||||
|
||||
local data = code_action.data.id
|
||||
return string.sub(data, #data - 1, #data) == ":0"
|
||||
end,
|
||||
apply = true,
|
||||
})
|
||||
end)
|
||||
nnoremap("<leader>gr", function()
|
||||
vim.lsp.buf.references()
|
||||
end)
|
||||
nnoremap("<leader>rn", function()
|
||||
vim.lsp.buf.rename()
|
||||
end)
|
||||
inoremap("<C-h>", function()
|
||||
vim.lsp.buf.signature_help()
|
||||
end)
|
||||
nnoremap("<leader>f", function()
|
||||
vim.lsp.buf.format({ async = true })
|
||||
end)
|
||||
end,
|
||||
}, _config or {})
|
||||
end
|
||||
|
||||
require("lspconfig").solargraph.setup(config())
|
||||
require("lspconfig").zls.setup(config())
|
||||
|
||||
require("lspconfig").tsserver.setup(config())
|
||||
|
||||
require("lspconfig").ccls.setup(config())
|
||||
|
||||
require("lspconfig").jedi_language_server.setup(config())
|
||||
|
||||
require("lspconfig").svelte.setup(config())
|
||||
|
||||
require("lspconfig").solang.setup(config())
|
||||
|
||||
require("lspconfig").cssls.setup(config())
|
||||
|
||||
require("lspconfig").gopls.setup(config({
|
||||
cmd = { "gopls", "serve" },
|
||||
settings = {
|
||||
gopls = {
|
||||
analyses = {
|
||||
unusedparams = true,
|
||||
},
|
||||
staticcheck = true,
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
-- who even uses this?
|
||||
require("lspconfig").rust_analyzer.setup(config({
|
||||
cmd = { "rustup", "run", "nightly", "rust-analyzer" },
|
||||
}))
|
||||
|
||||
require("lspconfig").sumneko_lua.setup(config({
|
||||
cmd = { sumneko_binary, "-E", sumneko_root_path .. "/main.lua" },
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
|
||||
version = "LuaJIT",
|
||||
-- Setup your lua path
|
||||
path = vim.split(package.path, ";"),
|
||||
},
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = { "vim" },
|
||||
},
|
||||
workspace = {
|
||||
-- Make the server aware of Neovim runtime files
|
||||
library = {
|
||||
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
|
||||
[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
local opts = {
|
||||
-- whether to highlight the currently hovered symbol
|
||||
-- disable if your cpu usage is higher than you want it
|
||||
-- or you just hate the highlight
|
||||
-- default: true
|
||||
highlight_hovered_item = true,
|
||||
|
||||
-- whether to show outline guides
|
||||
-- default: true
|
||||
show_guides = true,
|
||||
}
|
||||
|
||||
require("symbols-outline").setup(opts)
|
||||
|
||||
local snippets_paths = function()
|
||||
local plugins = { "friendly-snippets" }
|
||||
local paths = {}
|
||||
local path
|
||||
local root_path = vim.env.HOME .. "/.vim/plugged/"
|
||||
for _, plug in ipairs(plugins) do
|
||||
path = root_path .. plug
|
||||
if vim.fn.isdirectory(path) ~= 0 then
|
||||
table.insert(paths, path)
|
||||
end
|
||||
lsp.on_attach = function(client, bufnr)
|
||||
-- Disable LSP server formatting, to prevent formatting twice.
|
||||
-- Once by the LSP server, second time by NULL-ls.
|
||||
if client.name == "volar" or client.name == "tsserver" then
|
||||
client.server_capabilities.documentFormattingProvider = false
|
||||
client.server_capabilities.documentFormattingRangeProvider = false
|
||||
end
|
||||
return paths
|
||||
|
||||
local opts = { buffer = bufnr, remap = false }
|
||||
|
||||
nnoremap("gd", function()
|
||||
vim.lsp.buf.definition()
|
||||
end, opts)
|
||||
nnoremap("gD", function()
|
||||
vim.lsp.buf.definition()
|
||||
end, opts)
|
||||
nnoremap("K", function()
|
||||
vim.lsp.buf.hover()
|
||||
end, opts)
|
||||
nnoremap("gi", function()
|
||||
vim.lsp.buf.implementation()
|
||||
end, opts)
|
||||
nnoremap("<leader>wa", function()
|
||||
vim.lsp.buf.add_workspace_folder()
|
||||
end, opts)
|
||||
nnoremap("<leader>wr", function()
|
||||
vim.lsp.buf.remove_workspace_folder()
|
||||
end, opts)
|
||||
nnoremap("<leader>wl", function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, opts)
|
||||
nnoremap("<leader>vws", function()
|
||||
vim.lsp.buf.workspace_symbol()
|
||||
end, opts)
|
||||
nnoremap("<leader>vd", function()
|
||||
vim.diagnostic.open_float()
|
||||
end, opts)
|
||||
nnoremap("[d", function()
|
||||
vim.diagnostic.goto_next()
|
||||
end, opts)
|
||||
nnoremap("]d", function()
|
||||
vim.diagnostic.goto_prev()
|
||||
end, opts)
|
||||
nnoremap("<leader>ca", function()
|
||||
vim.lsp.buf.code_action()
|
||||
end, opts)
|
||||
nnoremap("<leader>vco", function()
|
||||
vim.lsp.buf.code_action({
|
||||
filter = function(code_action)
|
||||
if not code_action or not code_action.data then
|
||||
return false
|
||||
end
|
||||
|
||||
local data = code_action.data.id
|
||||
return string.sub(data, #data - 1, #data) == ":0"
|
||||
end,
|
||||
apply = true,
|
||||
})
|
||||
end, opts)
|
||||
nnoremap("<leader>gr", function()
|
||||
vim.lsp.buf.references()
|
||||
end, opts)
|
||||
nnoremap("<leader>rn", function()
|
||||
vim.lsp.buf.rename()
|
||||
end, opts)
|
||||
inoremap("<C-h>", function()
|
||||
vim.lsp.buf.signature_help()
|
||||
end, opts)
|
||||
nnoremap("<leader>f", function()
|
||||
vim.lsp.buf.format({ async = true })
|
||||
end, opts)
|
||||
end
|
||||
|
||||
require("luasnip.loaders.from_vscode").lazy_load({
|
||||
paths = snippets_paths(),
|
||||
include = nil, -- Load all languages
|
||||
exclude = {},
|
||||
})
|
||||
lsp.setup()
|
||||
|
|
|
|||
|
|
@ -13,4 +13,19 @@ telescope.setup({
|
|||
},
|
||||
})
|
||||
|
||||
local builtin = require("telescope.builtin")
|
||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
|
||||
vim.keymap.set("n", "<leader>/", builtin.live_grep, {})
|
||||
vim.keymap.set("n", "<leader>*", builtin.grep_string, {})
|
||||
vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
|
||||
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
|
||||
|
||||
vim.keymap.set("n", "<leader>m", builtin.oldfiles, {})
|
||||
vim.keymap.set("n", "<leader>gb", builtin.git_branches, {})
|
||||
-- vim.keymap.set('n', '<leader>gs', builtin.git_status, {})
|
||||
vim.keymap.set("n", "<leader><leader>", builtin.git_files, {})
|
||||
vim.keymap.set("n", "<leader>ps", function()
|
||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
||||
end)
|
||||
|
||||
telescope.load_extension("fzf")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
require("nvim-treesitter.configs").setup({
|
||||
-- A list of parser names, or "all"
|
||||
ensure_installed = { "ruby", "typescript", "javascript", "lua", "rust" },
|
||||
ensure_installed = { "ruby", "typescript", "javascript", "lua", "rust", "typescript" },
|
||||
|
||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
sync_install = false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue