diff --git a/.config/nvim/lua/richistron/init.lua b/.config/nvim/lua/richistron/init.lua index 278b26c93..55f48a52c 100644 --- a/.config/nvim/lua/richistron/init.lua +++ b/.config/nvim/lua/richistron/init.lua @@ -1,5 +1,4 @@ require('richistron.packer') -require('richistron.lsp') require('richistron.set') require('richistron.maps') require('richistron.plugins_config') diff --git a/.config/nvim/lua/richistron/lsp.lua b/.config/nvim/lua/richistron/lsp.lua deleted file mode 100644 index a724b86ea..000000000 --- a/.config/nvim/lua/richistron/lsp.lua +++ /dev/null @@ -1,60 +0,0 @@ -local lsp = require("lsp-zero") - -lsp.preset("recommended") - --- lsp.ensure_installed({ - -- 'tsserver', - -- 'solargraph', - -- 'rust_analyzer', --- }) - --- Fix Undefined global 'vim' -lsp.nvim_workspace() - - -local cmp = require('cmp') ---local cmp_select = {behavior = cmp.SelectBehavior.Select} ---local cmp_mappings = lsp.defaults.cmp_mappings({ - --[''] = cmp.mapping.select_prev_item(cmp_select), - --[''] = cmp.mapping.select_next_item(cmp_select), - --[''] = cmp.mapping.confirm({ select = true }), - --[""] = cmp.mapping.complete(), ---}) - ---cmp_mappings[''] = nil ---cmp_mappings[''] = nil - -lsp.setup_nvim_cmp({ - mapping = cmp_mappings -}) - -lsp.set_preferences({ - suggest_lsp_servers = false, - sign_icons = { - error = 'E', - warn = 'W', - hint = 'H', - info = 'I' - } -}) - -lsp.on_attach(function(client, bufnr) - local opts = {buffer = bufnr, remap = false} - - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) - vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) - vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) -end) - -lsp.setup() - -vim.diagnostic.config({ - virtual_text = true -}) diff --git a/.config/nvim/lua/richistron/packer.lua b/.config/nvim/lua/richistron/packer.lua index 2586a0d36..75b13d5b3 100644 --- a/.config/nvim/lua/richistron/packer.lua +++ b/.config/nvim/lua/richistron/packer.lua @@ -9,8 +9,9 @@ return require('packer').startup(function(use) use({ 'rose-pine/neovim', as = 'rose-pine' }) use { - 'nvim-telescope/telescope.nvim', tag = '0.1.5', - -- or , branch = '0.1.x', + 'nvim-telescope/telescope.nvim', +-- tag = '0.1.5', + branch = '0.1.x', requires = { { 'nvim-lua/plenary.nvim' } } } @@ -20,28 +21,6 @@ return require('packer').startup(function(use) use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) use('editorconfig/editorconfig-vim') use('mbbill/undotree') - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v1.x', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, - { 'williamboman/mason.nvim' }, - { 'williamboman/mason-lspconfig.nvim' }, - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, - { 'hrsh7th/cmp-buffer' }, - { 'hrsh7th/cmp-path' }, - { 'saadparwaiz1/cmp_luasnip' }, - { 'hrsh7th/cmp-nvim-lsp' }, - { 'hrsh7th/cmp-nvim-lua' }, - - -- Snippets - { 'L3MON4D3/LuaSnip' }, - { 'rafamadriz/friendly-snippets' }, - } - } use('preservim/nerdcommenter') use('vim-airline/vim-airline') use('vim-airline/vim-airline-themes')