diff --git a/rcfiles/neovim.lua b/rcfiles/neovim.lua index 766174c..f29899b 100644 --- a/rcfiles/neovim.lua +++ b/rcfiles/neovim.lua @@ -36,19 +36,6 @@ vim.keymap.set('n', 'fb', tbuiltin.buffers, {}) vim.keymap.set('n', 'fh', tbuiltin.help_tags, {}) vim.keymap.set('n', 'fs', tbuiltin.spell_suggest, {}) --- Mason (tool manager) setup --- we want rust-analyzer and codelldb -require("mason").setup({ - ui = { - icons = { - package_installed = "✔️", - package_pending = "🔄", - package_uninstalled = "🌐" - } - } -}) -require("mason-lspconfig").setup() - -- General LSP settings local sign = function(opts) vim.fn.sign_define(opts.name, { diff --git a/vim.nix b/vim.nix index 9b02bce..30a7440 100644 --- a/vim.nix +++ b/vim.nix @@ -17,9 +17,8 @@ nvim-treesitter-parsers.toml nvim-treesitter-parsers.python jedi-vim - mason-nvim - mason-tool-installer-nvim - mason-lspconfig-nvim + nvim-lspconfig + nvim-lsputils fzf-vim sleuth whitespace-nvim # ,t to trim whitespace