From 063a693f1900b9943a8b061a4f5678829a81ec95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Kmie=C4=87?= Date: Thu, 23 May 2024 00:13:18 +0200 Subject: [PATCH] Nvim: switch from nvim-cmp to epo --- .config/nvim/lua/plugins/epo.lua | 13 +++++++++++++ .config/nvim/lua/plugins/lspconfig.lua | 6 +++++- .config/nvim/lua/plugins/nvim-cmp.lua | 7 ++++--- .config/nvim/lua/plugins/snippets.lua | 3 ++- 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 .config/nvim/lua/plugins/epo.lua diff --git a/.config/nvim/lua/plugins/epo.lua b/.config/nvim/lua/plugins/epo.lua new file mode 100644 index 0000000..8ca5e2a --- /dev/null +++ b/.config/nvim/lua/plugins/epo.lua @@ -0,0 +1,13 @@ +return { + 'nvimdev/epo.nvim', + config = function() + -- the default completetopt set by epo + vim.opt.completeopt = "menu,menuone,noselect,popup" + + -- use default settings + require('epo').setup({ + fuzzy = true, + signature_border = 'rounded', + }) + end +} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index fec213d..4a8a00e 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -162,7 +162,11 @@ return { end }) - local capabilities = require('cmp_nvim_lsp').default_capabilities() + --local capabilities = require('cmp_nvim_lsp').default_capabilities() + local capabilities = vim.tbl_deep_extend('force', + vim.lsp.protocol.make_client_capabilities(), + require('epo').register_cap() + ) capabilities.offsetEncoding = { "utf-16" } nvim_lsp.groovyls.setup({ diff --git a/.config/nvim/lua/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua index b4be0ed..24b84e3 100644 --- a/.config/nvim/lua/plugins/nvim-cmp.lua +++ b/.config/nvim/lua/plugins/nvim-cmp.lua @@ -1,6 +1,6 @@ return { -{ 'tzachar/cmp-ai', dependencies = 'nvim-lua/plenary.nvim'}, -{ 'petertriho/cmp-git'}, +{ 'tzachar/cmp-ai', dependencies = 'nvim-lua/plenary.nvim', enabled = false}, +{ 'petertriho/cmp-git', enabled = false}, { 'hrsh7th/nvim-cmp', dependencies = { @@ -152,6 +152,7 @@ return { }) require("cmp_git").setup() - end + end, + enabled = false } } diff --git a/.config/nvim/lua/plugins/snippets.lua b/.config/nvim/lua/plugins/snippets.lua index d542b4c..0c9b25a 100644 --- a/.config/nvim/lua/plugins/snippets.lua +++ b/.config/nvim/lua/plugins/snippets.lua @@ -17,5 +17,6 @@ return { }, }, }) -end + end, + enabled = false }