Skip to content

Commit

Permalink
neovim: Remove mason
Browse files Browse the repository at this point in the history
LSPs need to be installed by nix otherwise there are too many problems.
Currently I'm using devenv for this.
  • Loading branch information
juanibiapina committed Mar 17, 2024
1 parent 0bb9df0 commit d008462
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 45 deletions.
51 changes: 13 additions & 38 deletions dotfiles/nvim/.config/nvim/conf/auto/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,46 +32,21 @@ local on_attach = function(_, bufnr)
end, { desc = 'Format current buffer with LSP' })
end

-- local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities = require('cmp_nvim_lsp').default_capabilities()

-- Language servers to be installed using mason
-- https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers
-- configure the LSP servers
local servers = {
tsserver = {},
-- Do not install solargraph since it's a gem. Do this per project instead.
-- solargraph = {},

lua_ls = {
Lua = {
workspace = { checkThirdParty = false },
},
},

terraformls = {},
"gopls",
"lua_ls",
"nil_ls",
"terraformls",
"tsserver",
}

require('mason').setup()
require('mason-lspconfig').setup({
ensure_installed = vim.tbl_keys(servers),
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities = require('cmp_nvim_lsp').default_capabilities()

handlers = {
function(server_name)
require('lspconfig')[server_name].setup {
capabilities = capabilities,
on_attach = on_attach,
settings = servers[server_name],
}
end,
for _, server in ipairs(servers) do
require('lspconfig')[server].setup {
capabilities = capabilities,
on_attach = on_attach,
}
})

require('lspconfig').gopls.setup {
capabilities = capabilities,
on_attach = on_attach,
}

require('lspconfig').nil_ls.setup {
capabilities = capabilities,
on_attach = on_attach,
}
end
7 changes: 0 additions & 7 deletions dotfiles/nvim/.config/nvim/lua/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ return {
{
'neovim/nvim-lspconfig',
dependencies = {
-- Automatically install LSPs to stdpath for neovim
{
"williamboman/mason.nvim",
build = ":MasonUpdate",
},
'williamboman/mason-lspconfig.nvim',

-- Status updates for LSP
{ 'j-hui/fidget.nvim' },
},
Expand Down

0 comments on commit d008462

Please sign in to comment.