diff --git a/nvim-fredrik/lua/plugins/blink.lua b/nvim-fredrik/lua/plugins/blink.lua new file mode 100644 index 00000000..9886de81 --- /dev/null +++ b/nvim-fredrik/lua/plugins/blink.lua @@ -0,0 +1,32 @@ +return { + + { + "saghen/blink.cmp", + lazy = false, -- lazy loading handled internally + -- optional: provides snippets for the snippet source + dependencies = "rafamadriz/friendly-snippets", + + -- use a release tag to download pre-built binaries + version = "v0.*", + -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust + -- build = 'cargo build --release', + + opts = { + highlight = { + -- sets the fallback highlight groups to nvim-cmp's highlight groups + -- useful for when your theme doesn't support blink.cmp + -- will be removed in a future release, assuming themes add support + use_nvim_cmp_as_default = true, + }, + -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- adjusts spacing to ensure icons are aligned + nerd_font_variant = "normal", + + -- experimental auto-brackets support + -- accept = { auto_brackets = { enabled = true } } + + -- experimental signature help support + -- trigger = { signature_help = { enabled = true } } + }, + }, +} diff --git a/nvim-fredrik/lua/plugins/cmp.lua b/nvim-fredrik/lua/plugins/cmp.lua index 822e1569..9fa94d57 100644 --- a/nvim-fredrik/lua/plugins/cmp.lua +++ b/nvim-fredrik/lua/plugins/cmp.lua @@ -2,6 +2,7 @@ return { { "hrsh7th/nvim-cmp", + enabled = false, dependencies = { { "hrsh7th/cmp-buffer" }, { "hrsh7th/cmp-path" }, diff --git a/nvim-fredrik/lua/plugins/copilot.lua b/nvim-fredrik/lua/plugins/copilot.lua index 10ec9e51..8e4869ff 100644 --- a/nvim-fredrik/lua/plugins/copilot.lua +++ b/nvim-fredrik/lua/plugins/copilot.lua @@ -14,7 +14,10 @@ return { { "zbirenbaum/copilot.lua", dependencies = { - { "hrsh7th/nvim-cmp" }, + { + "hrsh7th/nvim-cmp", + enabled = false, + }, { "nvim-lualine/lualine.nvim", event = "VeryLazy", @@ -102,7 +105,8 @@ return { }, config = function(_, opts) require("CopilotChat").setup(opts) - require("CopilotChat.integrations.cmp").setup() + -- NOTE: cmp is disabled + -- require("CopilotChat.integrations.cmp").setup() end, keys = require("config.keymaps").setup_copilot_chat_keymaps(), }, diff --git a/nvim-fredrik/lua/plugins/lsp.lua b/nvim-fredrik/lua/plugins/lsp.lua index dced2458..40851e5c 100644 --- a/nvim-fredrik/lua/plugins/lsp.lua +++ b/nvim-fredrik/lua/plugins/lsp.lua @@ -81,6 +81,7 @@ return { }, { "hrsh7th/nvim-cmp", + enabled = false, -- NOTE: this is here because we get the default client capabilities from cmp_nvim_lsp -- see cmp.lua for more settings. }, @@ -139,7 +140,8 @@ return { -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. local client_capabilities = vim.lsp.protocol.make_client_capabilities() -- The nvim-cmp almost supports LSP's capabilities so you should advertise it to LSP servers.. - local completion_capabilities = require("cmp_nvim_lsp").default_capabilities() + -- local completion_capabilities = require("cmp_nvim_lsp").default_capabilities() + local completion_capabilities = {} -- cmp disabled local capabilities = vim.tbl_deep_extend("force", client_capabilities, completion_capabilities) local supported_servers = {}