From b11c9c8d142d2eb18e2df4619e0faefc6acd6e9a Mon Sep 17 00:00:00 2001 From: Taken Date: Thu, 9 Jan 2025 20:41:11 +0100 Subject: [PATCH] Moved back to blink --- lua/taken/plugins/blink.lua | 2 +- lua/taken/plugins/lsp/lspconfig.lua | 12 ++++++------ lua/taken/plugins/nvim-cmp.lua | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lua/taken/plugins/blink.lua b/lua/taken/plugins/blink.lua index 23b7f0d..d10a591 100644 --- a/lua/taken/plugins/blink.lua +++ b/lua/taken/plugins/blink.lua @@ -4,7 +4,7 @@ return { "rafamadriz/friendly-snippets", "L3MON4D3/LuaSnip", }, - -- enabled = false, + enabled = false, version = "*", config = function() require("blink-cmp").setup({ diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua index ede7c53..32d277a 100644 --- a/lua/taken/plugins/lsp/lspconfig.lua +++ b/lua/taken/plugins/lsp/lspconfig.lua @@ -3,8 +3,8 @@ return { "neovim/nvim-lspconfig", dependencies = { { "antosha417/nvim-lsp-file-operations", config = true }, - "hrsh7th/cmp-nvim-lsp", - -- "saghen/blink.cmp", + -- "hrsh7th/cmp-nvim-lsp", + "saghen/blink.cmp", "nvim-lua/plenary.nvim", "pmizio/typescript-tools.nvim", "dmmulroy/ts-error-translator.nvim", @@ -13,14 +13,14 @@ return { config = function() local lspconfig = require("lspconfig") local tserrortranslator = require("ts-error-translator") - local cmp_nvim_lsp = require("cmp_nvim_lsp") - -- local blink = require("blink.cmp") + -- local cmp_nvim_lsp = require("cmp_nvim_lsp") + local blink = require("blink.cmp") local util = require("lspconfig.util") local path = util.path local on_attach = require("taken.utils.on_attach") - local capabilities = cmp_nvim_lsp.default_capabilities() - -- local capabilities = blink.get_lsp_capabilities() + -- local capabilities = cmp_nvim_lsp.default_capabilities() + local capabilities = blink.get_lsp_capabilities() local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " } for type, icon in pairs(signs) do diff --git a/lua/taken/plugins/nvim-cmp.lua b/lua/taken/plugins/nvim-cmp.lua index 8c65925..f526c50 100644 --- a/lua/taken/plugins/nvim-cmp.lua +++ b/lua/taken/plugins/nvim-cmp.lua @@ -11,6 +11,7 @@ return { "rafamadriz/friendly-snippets", "onsails/lspkind.nvim", }, + enabled = false, event = "InsertEnter", config = function() local cmp = require("cmp")