diff options
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 21 | ||||
| -rw-r--r-- | .config/nvim/lua/setup/lspconfig.lua | 85 |
2 files changed, 60 insertions, 46 deletions
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 68a0ee1..e02cb3e 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -52,6 +52,14 @@ return require('packer').startup(function(use) } use { + "kyazdani42/nvim-tree.lua", + cmd = { "NvimTreeToggle", "NvimTreeFindFile" }, + config = function() + require "setup.nvim-tree" + end, + } + + use { "nvim-treesitter/nvim-treesitter", event = { "BufRead", "BufNewFile" }, config = function() @@ -72,16 +80,19 @@ return require('packer').startup(function(use) use { "neovim/nvim-lspconfig", event = { "BufRead", "BufNewFile" }, - } - - use { - "williamboman/nvim-lsp-installer", - after = "nvim-lspconfig", config = function() require "setup.lspconfig" end, } + -- use { + -- "williamboman/nvim-lsp-installer", + -- after = "nvim-lspconfig", + -- config = function() + -- require "setup.lspconfig" + -- end, + -- } + use { "ray-x/lsp_signature.nvim", after = "nvim-lspconfig", diff --git a/.config/nvim/lua/setup/lspconfig.lua b/.config/nvim/lua/setup/lspconfig.lua index ab969fd..373c347 100644 --- a/.config/nvim/lua/setup/lspconfig.lua +++ b/.config/nvim/lua/setup/lspconfig.lua @@ -1,15 +1,15 @@ -require("nvim-lsp-installer").setup {} +-- require("nvim-lsp-installer").setup {} local lspconfig = require("lspconfig") local function on_attach() - vim.cmd([[ - doautocmd User lspAttached + vim.cmd("doautocmd User lspAttached") - augroup Format - au! * <buffer> - au BufWritePre <buffer> lua vim.lsp.buf.formatting_sync() - augroup END - ]]) + -- vim.cmd([[ + -- augroup Format + -- au! * <buffer> + -- au BufWritePre <buffer> lua vim.lsp.buf.formatting_sync() + -- augroup END + -- ]]) end lspconfig.sumneko_lua.setup { @@ -22,50 +22,53 @@ lspconfig.sumneko_lua.setup { } } } -lspconfig.hls.setup { - on_attach = on_attach, -} -lspconfig.pyright.setup { - on_attach = on_attach, -} -lspconfig.clangd.setup { +-- lspconfig.hls.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.pyright.setup { +-- on_attach = on_attach, +-- } +lspconfig.ccls.setup { on_attach = on_attach, } +-- lspconfig.clangd.setup { +-- on_attach = on_attach, +-- } lspconfig.rust_analyzer.setup { on_attach = on_attach, } lspconfig.bashls.setup { on_attach = on_attach, } -lspconfig.dockerls.setup { - on_attach = on_attach, -} +-- lspconfig.dockerls.setup { +-- on_attach = on_attach, +-- } -- lspconfig.yamlls.setup { -- on_attach = on_attach, -- } -lspconfig.html.setup { - on_attach = on_attach, -} -lspconfig.cssls.setup { - on_attach = on_attach, -} -lspconfig.marksman.setup { - on_attach = on_attach, -} -lspconfig.jsonls.setup { - on_attach = on_attach, -} -lspconfig.tsserver.setup { - on_attach = on_attach, -} -lspconfig.omnisharp.setup { - on_attach = on_attach, - use_mono = true, -} -lspconfig.texlab.setup { - on_attach = on_attach, -} -vim.cmd("let g:tex_flavor = 'tex'") +-- lspconfig.html.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.cssls.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.marksman.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.jsonls.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.tsserver.setup { +-- on_attach = on_attach, +-- } +-- lspconfig.omnisharp.setup { +-- on_attach = on_attach, +-- use_mono = true, +-- } +-- lspconfig.texlab.setup { +-- on_attach = on_attach, +-- } +-- vim.cmd("let g:tex_flavor = 'tex'") local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " } for type, icon in pairs(signs) do |