aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--nvim/.config/nvim/lazy-lock.json1
-rw-r--r--nvim/.config/nvim/lua/plugins/lspconfig.lua8
2 files changed, 2 insertions, 7 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index fb39092..190ff5a 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -8,7 +8,6 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
"dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
- "epo.nvim": { "branch": "main", "commit": "78765df88e62f817f4ce934bc07b76c97ba2c75b" },
"ferris.nvim": { "branch": "main", "commit": "52e39c017f511e8cf9a024022d48164bfbfe52ee" },
"fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
"gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
diff --git a/nvim/.config/nvim/lua/plugins/lspconfig.lua b/nvim/.config/nvim/lua/plugins/lspconfig.lua
index 635037f..bac8483 100644
--- a/nvim/.config/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/plugins/lspconfig.lua
@@ -3,8 +3,7 @@ local M = {
"neovim/nvim-lspconfig",
event = "BufReadPre",
dependencies = {
- -- { "hrsh7th/cmp-nvim-lsp", opts = {} },
- "nvimdev/epo.nvim",
+ { "hrsh7th/cmp-nvim-lsp", opts = {} },
{ "folke/neodev.nvim", opts = {} },
{ "folke/neoconf.nvim", cmd = "Neoconf", dependencies = { "nvim-lspconfig" }, opts = {} },
},
@@ -12,11 +11,8 @@ local M = {
function M:config()
require("neoconf")
- -- require("lspconfig").util.default_config.capabilities =
- -- require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-
require("lspconfig").util.default_config.capabilities =
- vim.tbl_deep_extend("force", vim.lsp.protocol.make_client_capabilities(), require("epo").register_cap())
+ require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
require("lspconfig.ui.windows").default_options.border = "single"