From 908e7ab026c9d8f912404bafe3c243b699d6c0e4 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 27 Jan 2025 06:52:32 +0100 Subject: [PATCH] nvim: remove nvim-cmp --- nvim/lua/user/plugins/editor.lua | 14 -------------- nvim/lua/user/plugins/lsp.lua | 25 +------------------------ 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/nvim/lua/user/plugins/editor.lua b/nvim/lua/user/plugins/editor.lua index d1a5112..f4f0c6f 100644 --- a/nvim/lua/user/plugins/editor.lua +++ b/nvim/lua/user/plugins/editor.lua @@ -162,20 +162,6 @@ return { require("luasnip.loaders.from_vscode").lazy_load() end, }, - { - "hrsh7th/nvim-cmp", - optional = true, - dependencies = { - "saadparwaiz1/cmp_luasnip" - }, - opts = { - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - } - } - } }, opts = {}, config = function(_, opts) diff --git a/nvim/lua/user/plugins/lsp.lua b/nvim/lua/user/plugins/lsp.lua index a039477..fa22c41 100644 --- a/nvim/lua/user/plugins/lsp.lua +++ b/nvim/lua/user/plugins/lsp.lua @@ -9,27 +9,6 @@ return { { "williamboman/mason-lspconfig.nvim", config = function () end } } }, - { - -- Autocomplete source - "hrsh7th/nvim-cmp", - optional = true, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-nvim-lsp-signature-help" - }, - }, - -- Using blink.nvim atm. - -- { - -- "ray-x/lsp_signature.nvim", - -- event = "VeryLazy", - -- opts = { - -- hint_enable = false, - -- fix_pos = true, - -- handler_opts = { - -- border = "none" - -- } - -- }, - -- }, -- LSP often return markdown that neovim parses. -- make sure we have a plugin that can render markdown to nicer text { @@ -87,10 +66,8 @@ return { local lspconfig = require("lspconfig") local utils = require("user.utils.lsp") local augroup = vim.api.nvim_create_augroup("Lsp", {}) - local has_cmp, cmp_lsp = pcall(require, "cmp_nvim_lsp") local capabilities = vim.tbl_deep_extend('force', - vim.lsp.protocol.make_client_capabilities() or {}, - has_cmp and cmp_lsp.default_capabilities() or {}) + vim.lsp.protocol.make_client_capabilities() or {}) --- @param server string local function setup(server)