add dressing for popup menus and migrate from deprecated lspinstall to lsp-installer

This commit is contained in:
Patrick Michl 2022-01-28 08:50:52 +01:00
parent 8cbfecc80b
commit c43b6e5704
4 changed files with 16 additions and 12 deletions

View File

@ -1,7 +1,9 @@
require 'plugins' require 'plugins'
vim.g.onedark_style = 'warmer' require('onedark').setup {
require('onedark').setup() style = 'warmer'
}
require('onedark').load()
require 'lsp' require 'lsp'
require 'completion' require 'completion'

View File

@ -2,7 +2,7 @@ local key = vim.api.nvim_set_keymap
local u = require('utils') local u = require('utils')
vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]]) vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]])
vim.cmd([[autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({focusable = false})]]) vim.cmd([[autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})]])
key('n', ';', ':Telescope find_files<CR>', {}) key('n', ';', ':Telescope find_files<CR>', {})
key('', '<C-n>', ':NvimTreeToggle<CR>', {}) key('', '<C-n>', ':NvimTreeToggle<CR>', {})

View File

@ -1,4 +1,3 @@
require'lspinstall'.setup()
local u = require('utils') local u = require('utils')
local nvim_lsp = require'lspconfig' local nvim_lsp = require'lspconfig'
@ -54,24 +53,24 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
local servers = require'lspinstall'.installed_servers() local servers = require'nvim-lsp-installer'
for _, lsp in ipairs(servers) do servers.on_server_ready(function(server)
local config = { local config = {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
flags = {debounce_text_changes = 150} flags = {debounce_text_changes = 150}
} }
if lsp == "lua" then if server.name == "sumneko_lua" then
config.settings = require'lsp.lua' config.settings = require'lsp.lua'
end end
if lsp == "rust" then if server.name == "rust_analyzer" then
config.settings = require'lsp.rust' config.settings = require'lsp.rust'
end end
nvim_lsp[lsp].setup(config) server:setup(config)
end end)
-- Set completeopt to have a better completion experience -- Set completeopt to have a better completion experience
vim.o.completeopt = 'menuone,noselect' vim.o.completeopt = 'menuone,noselect'

View File

@ -48,7 +48,8 @@ return require('packer').startup({function()
use 'akinsho/toggleterm.nvim' use 'akinsho/toggleterm.nvim'
-- LSP Setup -- LSP Setup
use 'neovim/nvim-lspconfig' use 'neovim/nvim-lspconfig'
use 'kabouzeid/nvim-lspinstall' -- use 'kabouzeid/nvim-lspinstall'
use 'williamboman/nvim-lsp-installer'
use 'nvim-lua/lsp_extensions.nvim' use 'nvim-lua/lsp_extensions.nvim'
use 'nvim-lua/completion-nvim' use 'nvim-lua/completion-nvim'
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
@ -69,6 +70,8 @@ return require('packer').startup({function()
use 'kyazdani42/nvim-web-devicons' use 'kyazdani42/nvim-web-devicons'
use 'stevearc/dressing.nvim'
use { use {
'kyazdani42/nvim-tree.lua', 'kyazdani42/nvim-tree.lua',
cmd = { cmd = {