update neovim
This commit is contained in:
parent
f9615d056b
commit
5228c81e6c
3 changed files with 129 additions and 124 deletions
|
@ -41,7 +41,7 @@ local function on_attach(args)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.setup()
|
function M.setup()
|
||||||
require("lua-dev").setup({})
|
require("neodev").setup({})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('LspAttach', {
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
callback = on_attach
|
callback = on_attach
|
||||||
|
@ -49,6 +49,8 @@ function M.setup()
|
||||||
|
|
||||||
local nvim_lsp = require('lspconfig')
|
local nvim_lsp = require('lspconfig')
|
||||||
|
|
||||||
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
|
||||||
-- Use a loop to conveniently both setup defined servers
|
-- Use a loop to conveniently both setup defined servers
|
||||||
-- and map buffer local keybindings when the language server attaches
|
-- and map buffer local keybindings when the language server attaches
|
||||||
local servers = {
|
local servers = {
|
||||||
|
@ -67,13 +69,13 @@ function M.setup()
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup {
|
nvim_lsp[lsp].setup {
|
||||||
on_attach = M.on_attach,
|
on_attach = M.on_attach,
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()),
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
require('lspconfig').jsonls.setup {
|
require('lspconfig').jsonls.setup {
|
||||||
-- on_attach = M.on_attach,
|
-- on_attach = M.on_attach,
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()),
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = {
|
||||||
validate = { enable = true },
|
validate = { enable = true },
|
||||||
json = {
|
json = {
|
||||||
|
@ -97,7 +99,7 @@ function M.setup()
|
||||||
|
|
||||||
require 'lspconfig'.phpactor.setup {
|
require 'lspconfig'.phpactor.setup {
|
||||||
-- on_attach = M.on_attach,
|
-- on_attach = M.on_attach,
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()),
|
capabilities = capabilities,
|
||||||
|
|
||||||
root_dir = function(startpath)
|
root_dir = function(startpath)
|
||||||
local u = require('lspconfig.util')
|
local u = require('lspconfig.util')
|
||||||
|
@ -113,12 +115,12 @@ function M.setup()
|
||||||
require 'lspconfig'.omnisharp.setup {
|
require 'lspconfig'.omnisharp.setup {
|
||||||
cmd = { '/usr/bin/omnisharp', '--languageserver', '--hostPID', tostring(pid) },
|
cmd = { '/usr/bin/omnisharp', '--languageserver', '--hostPID', tostring(pid) },
|
||||||
-- on_attach = M.on_attach,
|
-- on_attach = M.on_attach,
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
capabilities = capabilities,
|
||||||
}
|
}
|
||||||
|
|
||||||
require 'lspconfig'.powershell_es.setup {
|
require 'lspconfig'.powershell_es.setup {
|
||||||
bundle_path = '/home/vladimir/devel/PowerShellEditorServices/module',
|
bundle_path = '/home/vladimir/devel/PowerShellEditorServices/module',
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
capabilities = capabilities,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
function M.setup()
|
function M.setup()
|
||||||
local nls = require "null-ls"
|
local nls = require "null-ls"
|
||||||
|
|
||||||
nls.setup({
|
nls.setup({
|
||||||
debug = true,
|
debug = true,
|
||||||
sources = {
|
sources = {
|
||||||
nls.builtins.formatting.xmllint,
|
nls.builtins.formatting.xmllint,
|
||||||
|
@ -51,7 +51,7 @@ nls.setup({
|
||||||
nls.builtins.code_actions.eslint,
|
nls.builtins.code_actions.eslint,
|
||||||
nls.builtins.diagnostics.yamllint,
|
nls.builtins.diagnostics.yamllint,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -68,7 +68,7 @@ function M.setup()
|
||||||
config = function() require 'gitsigns'.setup({}) end }
|
config = function() require 'gitsigns'.setup({}) end }
|
||||||
|
|
||||||
use { 'hoob3rt/lualine.nvim',
|
use { 'hoob3rt/lualine.nvim',
|
||||||
requires = { 'kyazdani42/nvim-web-devicons', opt = true },
|
requires = { 'kyazdani42/nvim-web-devicons' },
|
||||||
config = require("configs.lualine").setup
|
config = require("configs.lualine").setup
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ function M.setup()
|
||||||
|
|
||||||
use { 'dyng/ctrlsf.vim', cmd = 'CtrlSF' }
|
use { 'dyng/ctrlsf.vim', cmd = 'CtrlSF' }
|
||||||
|
|
||||||
use { 'folke/lua-dev.nvim' }
|
use { 'folke/neodev.nvim' }
|
||||||
use { 'rafcamlet/nvim-luapad' }
|
use { 'rafcamlet/nvim-luapad' }
|
||||||
|
|
||||||
use { 'AndrewRadev/tagalong.vim' }
|
use { 'AndrewRadev/tagalong.vim' }
|
||||||
|
@ -119,7 +119,10 @@ function M.setup()
|
||||||
requires = "kyazdani42/nvim-web-devicons",
|
requires = "kyazdani42/nvim-web-devicons",
|
||||||
cmd = 'TroubleToggle',
|
cmd = 'TroubleToggle',
|
||||||
keys = { 'n', '<space>t <Cmd>TroubleToggle<CR>' },
|
keys = { 'n', '<space>t <Cmd>TroubleToggle<CR>' },
|
||||||
config = function() require('trouble').setup() end
|
config = function() require('trouble').setup({
|
||||||
|
mode = 'document_diagnostics'
|
||||||
|
})
|
||||||
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use { 'ziglang/zig.vim', ft = 'zig' }
|
use { 'ziglang/zig.vim', ft = 'zig' }
|
||||||
|
|
Loading…
Add table
Reference in a new issue