diff --git a/init.lua b/init.lua index 80fe4f0..6411cae 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,9 @@ require 'plugins' -vim.g.onedark_style = 'warmer' -require('onedark').setup() +require('onedark').setup { + style = 'warmer' +} +require('onedark').load() require 'lsp' require 'completion' diff --git a/lua/keys.lua b/lua/keys.lua index 675e1f0..c2e22c6 100644 --- a/lua/keys.lua +++ b/lua/keys.lua @@ -2,7 +2,7 @@ local key = vim.api.nvim_set_keymap local u = require('utils') 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', {}) key('', '', ':NvimTreeToggle', {}) diff --git a/lua/lsp.lua b/lua/lsp.lua index b739a67..066b97e 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -1,4 +1,3 @@ -require'lspinstall'.setup() local u = require('utils') 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) -local servers = require'lspinstall'.installed_servers() -for _, lsp in ipairs(servers) do +local servers = require'nvim-lsp-installer' +servers.on_server_ready(function(server) local config = { on_attach = on_attach, capabilities = capabilities, flags = {debounce_text_changes = 150} } - if lsp == "lua" then + if server.name == "sumneko_lua" then config.settings = require'lsp.lua' end - if lsp == "rust" then + if server.name == "rust_analyzer" then config.settings = require'lsp.rust' end - nvim_lsp[lsp].setup(config) -end - + server:setup(config) +end) -- Set completeopt to have a better completion experience vim.o.completeopt = 'menuone,noselect' + diff --git a/lua/plugins.lua b/lua/plugins.lua index 7ab33e4..629317c 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -48,7 +48,8 @@ return require('packer').startup({function() use 'akinsho/toggleterm.nvim' -- LSP Setup 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/completion-nvim' use 'nvim-lua/popup.nvim' @@ -69,6 +70,8 @@ return require('packer').startup({function() use 'kyazdani42/nvim-web-devicons' + use 'stevearc/dressing.nvim' + use { 'kyazdani42/nvim-tree.lua', cmd = {