woop, stuff
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
de155cef6d
commit
39628e8f2f
1 changed files with 256 additions and 245 deletions
|
|
@ -1,88 +1,88 @@
|
||||||
local function prereqs()
|
local function prereqs()
|
||||||
local output = vim.fn.system({
|
local output = vim.fn.system({
|
||||||
"which",
|
"which",
|
||||||
"rust-analyzer",
|
"rust-analyzer",
|
||||||
"&&",
|
"&&",
|
||||||
"rust-analyzer",
|
"rust-analyzer",
|
||||||
"--version",
|
"--version",
|
||||||
})
|
})
|
||||||
if output == nil or output == "" or string.find(output, "not installed for the toolchain") then
|
if output == nil or output == "" or string.find(output, "not installed for the toolchain") then
|
||||||
print("Installing rust-analyzer globally with rustup")
|
print("Installing rust-analyzer globally with rustup")
|
||||||
vim.fn.system({
|
vim.fn.system({
|
||||||
"rustup",
|
"rustup",
|
||||||
"component",
|
"component",
|
||||||
"add",
|
"add",
|
||||||
"rust-analyzer",
|
"rust-analyzer",
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
-- rust_analyzer = USES RUST_TOOLS INSTEAD, SEE BOTTOM OF THIS FILE
|
-- rust_analyzer = USES RUST_TOOLS INSTEAD, SEE BOTTOM OF THIS FILE
|
||||||
tsserver = {
|
tsserver = {
|
||||||
-- typescript/javascript
|
-- typescript/javascript
|
||||||
},
|
},
|
||||||
pyright = {
|
pyright = {
|
||||||
-- python
|
-- python
|
||||||
},
|
},
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
-- lua
|
-- lua
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = {
|
runtime = {
|
||||||
version = "LuaJIT",
|
version = "LuaJIT",
|
||||||
},
|
},
|
||||||
workspace = { checkThirdParty = false, library = vim.api.nvim_get_runtime_file("", true) },
|
workspace = { checkThirdParty = false, library = vim.api.nvim_get_runtime_file("", true) },
|
||||||
telemetry = { enable = false },
|
telemetry = { enable = false },
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
globals = {
|
globals = {
|
||||||
"vim",
|
"vim",
|
||||||
"require",
|
"require",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
bashls = {
|
bashls = {
|
||||||
-- bash
|
-- bash
|
||||||
},
|
},
|
||||||
cssls = {
|
cssls = {
|
||||||
-- css
|
-- css
|
||||||
},
|
},
|
||||||
cssmodules_ls = {
|
cssmodules_ls = {
|
||||||
-- css modules
|
-- css modules
|
||||||
},
|
},
|
||||||
dockerls = {
|
dockerls = {
|
||||||
-- docker
|
-- docker
|
||||||
},
|
},
|
||||||
docker_compose_language_service = {
|
docker_compose_language_service = {
|
||||||
-- docker compose
|
-- docker compose
|
||||||
},
|
},
|
||||||
jsonls = {
|
jsonls = {
|
||||||
-- json
|
-- json
|
||||||
},
|
},
|
||||||
marksman = {
|
marksman = {
|
||||||
-- markdown
|
-- markdown
|
||||||
},
|
},
|
||||||
taplo = {
|
taplo = {
|
||||||
-- toml
|
-- toml
|
||||||
},
|
},
|
||||||
yamlls = {
|
yamlls = {
|
||||||
-- yaml
|
-- yaml
|
||||||
},
|
},
|
||||||
lemminx = {
|
lemminx = {
|
||||||
-- xml
|
-- xml
|
||||||
},
|
},
|
||||||
rnix = {
|
rnix = {
|
||||||
-- Nix
|
-- Nix
|
||||||
},
|
},
|
||||||
ansiblels = {
|
ansiblels = {
|
||||||
-- ansible
|
-- ansible
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||||
virtual_text = true,
|
virtual_text = true,
|
||||||
signs = true,
|
signs = true,
|
||||||
update_in_insert = true,
|
update_in_insert = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- LSP config
|
-- LSP config
|
||||||
|
|
@ -90,189 +90,200 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagn
|
||||||
|
|
||||||
-- This function gets run when an LSP connects to a particular buffer.
|
-- This function gets run when an LSP connects to a particular buffer.
|
||||||
local on_attach = function(client, bufnr)
|
local on_attach = function(client, bufnr)
|
||||||
local nmap = function(keys, func, desc)
|
local nmap = function(keys, func, desc)
|
||||||
if desc then
|
if desc then
|
||||||
desc = "LSP: " .. desc
|
desc = "LSP: " .. desc
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
|
vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
|
||||||
end
|
end
|
||||||
|
|
||||||
nmap("<leader>lr", vim.lsp.buf.rename, "[R]ename")
|
nmap("<leader>lr", vim.lsp.buf.rename, "[R]ename")
|
||||||
nmap("<leader>la", vim.lsp.buf.code_action, "Code [A]ction")
|
nmap("<leader>la", vim.lsp.buf.code_action, "Code [A]ction")
|
||||||
|
|
||||||
nmap("gd", vim.lsp.buf.definition, "[G]oto [D]efinition")
|
nmap("gd", vim.lsp.buf.definition, "[G]oto [D]efinition")
|
||||||
nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
|
nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
|
||||||
nmap("gI", vim.lsp.buf.implementation, "[G]oto [I]mplementation")
|
nmap("gI", vim.lsp.buf.implementation, "[G]oto [I]mplementation")
|
||||||
nmap("<leader>D", vim.lsp.buf.type_definition, "Type [D]efinition")
|
nmap("<leader>D", vim.lsp.buf.type_definition, "Type [D]efinition")
|
||||||
|
|
||||||
-- See `:help K` for why this keymap
|
-- See `:help K` for why this keymap
|
||||||
nmap("K", vim.lsp.buf.hover, "Hover Documentation")
|
nmap("K", vim.lsp.buf.hover, "Hover Documentation")
|
||||||
nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
|
nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
|
||||||
|
|
||||||
-- Lesser used LSP functionality
|
-- Lesser used LSP functionality
|
||||||
nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
|
nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
|
||||||
|
|
||||||
-- disable tsserver so it does not conflict with prettier
|
-- disable tsserver so it does not conflict with prettier
|
||||||
if client.name == "tsserver" then
|
if client.name == "tsserver" then
|
||||||
client.server_capabilities.document_formatting = false
|
client.server_capabilities.document_formatting = false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local gen_capabilities = function(cmp)
|
local gen_capabilities = function(cmp)
|
||||||
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities = cmp.default_capabilities(capabilities)
|
capabilities = cmp.default_capabilities(capabilities)
|
||||||
end
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"lvimuser/lsp-inlayhints.nvim",
|
"lvimuser/lsp-inlayhints.nvim",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
-- Autocompletion
|
-- Autocompletion
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
"saadparwaiz1/cmp_luasnip",
|
"saadparwaiz1/cmp_luasnip",
|
||||||
"hrsh7th/cmp-buffer",
|
"hrsh7th/cmp-buffer",
|
||||||
"hrsh7th/cmp-path",
|
"hrsh7th/cmp-path",
|
||||||
--"Saecki/crates.nvim", -- SEE plugins/rust-tools.lua
|
--"Saecki/crates.nvim", -- SEE plugins/rust-tools.lua
|
||||||
"zbirenbaum/copilot-cmp",
|
"zbirenbaum/copilot-cmp",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
cmd = {
|
cmd = {
|
||||||
"Mason",
|
"Mason",
|
||||||
"MasonUpdate",
|
"MasonUpdate",
|
||||||
"MasonInstall",
|
"MasonInstall",
|
||||||
"MasonInstallAll",
|
"MasonInstallAll",
|
||||||
"MasonUninstall",
|
"MasonUninstall",
|
||||||
"MasonUninstallAll",
|
"MasonUninstallAll",
|
||||||
"MasonLog",
|
"MasonLog",
|
||||||
},
|
},
|
||||||
build = ":MasonUpdate",
|
build = ":MasonUpdate",
|
||||||
opts = {},
|
opts = {},
|
||||||
},
|
},
|
||||||
{ "folke/neodev.nvim", opts = {} }, -- lua stuff
|
{ "folke/neodev.nvim", opts = {} }, -- lua stuff
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = { "nvim-telescope/telescope.nvim" },
|
dependencies = { "nvim-telescope/telescope.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
local config = require("lspconfig")
|
local config = require("lspconfig")
|
||||||
-- local util = require("lspconfig/util")
|
-- local util = require("lspconfig/util")
|
||||||
local mason_lspconfig = require("mason-lspconfig")
|
local mason_lspconfig = require("mason-lspconfig")
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
local luasnip = require("luasnip")
|
local luasnip = require("luasnip")
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
|
||||||
local capabilities = gen_capabilities(require("cmp_nvim_lsp"))
|
local capabilities = gen_capabilities(require("cmp_nvim_lsp"))
|
||||||
|
|
||||||
-- Install servers used
|
-- Install servers used
|
||||||
mason_lspconfig.setup({
|
mason_lspconfig.setup({
|
||||||
ensure_installed = vim.tbl_keys(servers),
|
ensure_installed = vim.tbl_keys(servers),
|
||||||
})
|
})
|
||||||
|
|
||||||
local flags = {
|
local flags = {
|
||||||
allow_incremental_sync = true,
|
allow_incremental_sync = true,
|
||||||
debounce_text_changes = 200,
|
debounce_text_changes = 200,
|
||||||
}
|
}
|
||||||
|
|
||||||
mason_lspconfig.setup_handlers({
|
mason_lspconfig.setup_handlers({
|
||||||
function(server_name)
|
function(server_name)
|
||||||
config[server_name].setup({
|
config[server_name].setup({
|
||||||
flags = flags,
|
flags = flags,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
settings = servers[server_name],
|
settings = servers[server_name],
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Completion
|
-- Completion
|
||||||
luasnip.config.setup({})
|
luasnip.config.setup({})
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
snippet = {
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
luasnip.lsp_expand(args.body)
|
luasnip.lsp_expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
["<C-n>"] = cmp.mapping.select_next_item(),
|
["<C-n>"] = cmp.mapping.select_next_item(),
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item(),
|
["<C-p>"] = cmp.mapping.select_prev_item(),
|
||||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-Space>"] = cmp.mapping.complete({}),
|
["<C-Space>"] = cmp.mapping.complete({}),
|
||||||
["<CR>"] = cmp.mapping.confirm({
|
["<CR>"] = cmp.mapping.confirm({
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
select = true,
|
select = true,
|
||||||
}),
|
}),
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
elseif luasnip.expand_or_jumpable() then
|
elseif luasnip.expand_or_jumpable() then
|
||||||
luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_prev_item()
|
cmp.select_prev_item()
|
||||||
elseif luasnip.jumpable(-1) then
|
elseif luasnip.jumpable(-1) then
|
||||||
luasnip.jump(-1)
|
luasnip.jump(-1)
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
}),
|
}),
|
||||||
sources = {
|
sources = {
|
||||||
{ name = "copilot", priority = 8 },
|
{
|
||||||
{ name = "nvim_lsp", priority = 9 },
|
name = "copilot",
|
||||||
{ nane = "buffer", priority = 7 },
|
priority = 8,
|
||||||
{ name = "luasnip", priority = 6 },
|
keyword_length = 1,
|
||||||
{ name = "path" },
|
filter = function(keyword)
|
||||||
{ name = "crates" },
|
-- Check if keyword length is some number and not just whitespace
|
||||||
},
|
if #keyword < 2 or keyword:match("^%s*$") then
|
||||||
sorting = {
|
return false
|
||||||
priority_weight = 1,
|
end
|
||||||
comparators = {
|
return true
|
||||||
cmp.config.compare.locality,
|
end,
|
||||||
cmp.config.compare.recently_used,
|
},
|
||||||
cmp.config.compare.score,
|
{ name = "nvim_lsp", priority = 9 },
|
||||||
cmp.config.compare.offset,
|
{ nane = "buffer", priority = 7 },
|
||||||
cmp.config.compare.order,
|
{ name = "luasnip", priority = 6 },
|
||||||
},
|
{ name = "path" },
|
||||||
},
|
{ name = "crates" },
|
||||||
window = {
|
},
|
||||||
completion = cmp.config.window.bordered(),
|
sorting = {
|
||||||
documentation = cmp.config.window.bordered(),
|
priority_weight = 1,
|
||||||
},
|
comparators = {
|
||||||
})
|
cmp.config.compare.locality,
|
||||||
end,
|
cmp.config.compare.recently_used,
|
||||||
},
|
cmp.config.compare.score,
|
||||||
{ -- Rust tools
|
cmp.config.compare.offset,
|
||||||
"simrat39/rust-tools.nvim",
|
cmp.config.compare.order,
|
||||||
build = prereqs,
|
},
|
||||||
opts = {
|
},
|
||||||
server = {
|
window = {
|
||||||
on_attach = on_attach,
|
completion = cmp.config.window.bordered(),
|
||||||
},
|
documentation = cmp.config.window.bordered(),
|
||||||
},
|
},
|
||||||
config = function(_, opts)
|
})
|
||||||
opts.server.capabilities = gen_capabilities(require("cmp_nvim_lsp"))
|
end,
|
||||||
require("rust-tools").setup(opts)
|
},
|
||||||
end,
|
{ -- Rust tools
|
||||||
--config = function(_, opts)
|
"simrat39/rust-tools.nvim",
|
||||||
--require('rust-tools').setup(opts)
|
build = prereqs,
|
||||||
--end
|
opts = {
|
||||||
},
|
server = {
|
||||||
{ "Saecki/crates.nvim", tag = "v0.3.0", dependencies = { "nvim-lua/plenary.nvim" }, opts = {} },
|
on_attach = on_attach,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
config = function(_, opts)
|
||||||
|
opts.server.capabilities = gen_capabilities(require("cmp_nvim_lsp"))
|
||||||
|
require("rust-tools").setup(opts)
|
||||||
|
end,
|
||||||
|
--config = function(_, opts)
|
||||||
|
--require('rust-tools').setup(opts)
|
||||||
|
--end
|
||||||
|
},
|
||||||
|
{ "Saecki/crates.nvim", tag = "v0.3.0", dependencies = { "nvim-lua/plenary.nvim" }, opts = {} },
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue