Skip to content

Commit

Permalink
close #89
Browse files Browse the repository at this point in the history
Signed-off-by: tracyone <[email protected]>
  • Loading branch information
tracyone committed Oct 9, 2023
1 parent a16d17b commit d75a91e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
19 changes: 17 additions & 2 deletions lua/nvim_lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ require("mason").setup({
},
})
require("mason-lspconfig").setup({
ensure_installed = { "vimls", "lua_ls", 'bashls', 'clangd', 'pyright'},
automatic_installation = true,
ensure_installed = { "vimls", "lua_ls", "bashls", "clangd", "pyright", "marksman"},
automatic_installation = true,
handlers = nil,
})

Expand Down Expand Up @@ -285,3 +285,18 @@ require'lsp_signature'.setup(cfg) -- no need to specify bufnr if you don't use t
-- You can also do this inside lsp on_attach
-- note: on_attach deprecated
require'lsp_signature'.on_attach(cfg, bufnr) -- no need to specify bufnr if you don't use toggle_key


local null_ls = require 'null-ls'
null_ls.setup()

require("mason-null-ls").setup({
ensure_installed = {
"stylua", -- lua
"shfmt", -- shell script
"shellcheck",
"autopep8", --python
"prettier", -- web language
},
handlers = {},
})
2 changes: 2 additions & 0 deletions rc/lsp.vim
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ if te#env#IsNvim() >= 0.5
Plug 'folke/trouble.nvim'
Plug 'ray-x/lsp_signature.nvim'
Plug 'onsails/lspkind.nvim'
Plug 'nvimtools/none-ls.nvim'
Plug 'jay-babu/mason-null-ls.nvim'
function! s:lsp_setup()
lua << EOF
require('nvim_lsp')
Expand Down

0 comments on commit d75a91e

Please sign in to comment.