From eaae1ca7e8702a72cc9af8665515265b377f2249 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 30 Dec 2024 10:47:52 +0100 Subject: [PATCH] Disabled blink for now --- lua/taken/plugins/blink.lua | 1 + lua/taken/plugins/lsp/lspconfig.lua | 11 ++++++----- lua/taken/plugins/nvim-cmp.lua | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lua/taken/plugins/blink.lua b/lua/taken/plugins/blink.lua index 4ac3b81..032ce45 100644 --- a/lua/taken/plugins/blink.lua +++ b/lua/taken/plugins/blink.lua @@ -1,6 +1,7 @@ return { "saghen/blink.cmp", dependencies = "rafamadriz/friendly-snippets", + 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 ccad216..cb71895 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,13 +13,14 @@ return { config = function() local lspconfig = require("lspconfig") local tserrortranslator = require("ts-error-translator") - -- local cmp_nvim_lsp = require("cmp_nvim_lsp") + 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 = require("blink.cmp").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 f526c50..8c65925 100644 --- a/lua/taken/plugins/nvim-cmp.lua +++ b/lua/taken/plugins/nvim-cmp.lua @@ -11,7 +11,6 @@ return { "rafamadriz/friendly-snippets", "onsails/lspkind.nvim", }, - enabled = false, event = "InsertEnter", config = function() local cmp = require("cmp")