From 210bdbdddc8e836bf5a4d3b04de33109c20d8f0f Mon Sep 17 00:00:00 2001 From: gibbyb Date: Thu, 23 Apr 2026 09:21:51 -0400 Subject: [PATCH] Brought back supermavengit add -A! --- config/dot/nvim/lua/plugins/lsp.lua | 60 ++++++++++++++++++----------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/config/dot/nvim/lua/plugins/lsp.lua b/config/dot/nvim/lua/plugins/lsp.lua index 0378194..e4077e4 100644 --- a/config/dot/nvim/lua/plugins/lsp.lua +++ b/config/dot/nvim/lua/plugins/lsp.lua @@ -35,7 +35,8 @@ return { sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'luasnip' }, - { name = 'copilot' }, + { name = 'supermaven' }, + --{ name = 'copilot' }, }, { { name = 'buffer', keyword_length = 4 }, { name = 'path' }, @@ -46,7 +47,10 @@ return { format = lspkind.cmp_format({ mode = 'symbol', maxwidth = { menu = 50, abbr = 50 }, - symbol_map = { Copilot = '' }, + symbol_map = { + Copilot = '', + Supermaven = "", + }, ellipsis_char = '...', show_labelDetails = true, before = function(_, vim_item) @@ -104,11 +108,20 @@ return { { 'nvim-lua/plenary.nvim' }, { 'hrsh7th/cmp-path' }, { - 'zbirenbaum/copilot-cmp', + 'supermaven-inc/supermaven-nvim', config = function() - require 'copilot_cmp'.setup() + require'supermaven-nvim'.setup({ + disable_inline_completion = true, + disable_keymaps = true, + }) end, }, + --{ + --'zbirenbaum/copilot-cmp', + --config = function() + --require 'copilot_cmp'.setup() + --end, + --}, { 'hrsh7th/cmp-buffer' }, { 'hrsh7th/cmp-emoji' }, { 'SergioRibera/cmp-dotenv' }, @@ -180,19 +193,19 @@ return { version = 'v2.*', build = 'make install_jsregexp', }, - { - 'zbirenbaum/copilot.lua', - cmd = 'Copilot', - event = 'InsertEnter', - config = function() - require 'copilot'.setup({ - -- Disable native ghost text so copilot-cmp can manage suggestions instead - suggestion = { enabled = false }, - panel = { enabled = false }, - }) - end, - }, - { 'AndreM222/copilot-lualine' }, + --{ + --'zbirenbaum/copilot.lua', + --cmd = 'Copilot', + --event = 'InsertEnter', + --config = function() + --require 'copilot'.setup({ + ---- Disable native ghost text so copilot-cmp can manage suggestions instead + --suggestion = { enabled = false }, + --panel = { enabled = false }, + --}) + --end, + --}, + --{ 'AndreM222/copilot-lualine' }, { 'windwp/nvim-autopairs', event = 'InsertEnter', @@ -229,12 +242,12 @@ return { ) local cmp_autopairs = require 'nvim-autopairs.completion.cmp' cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - cmp.event:on('menu_opened', function() - vim.b.copilot_suggestion_hidden = true - end) - cmp.event:on('menu_closed', function() - vim.b.copilot_suggestion_hidden = false - end) + --cmp.event:on('menu_opened', function() + --vim.b.copilot_suggestion_hidden = true + --end) + --cmp.event:on('menu_closed', function() + --vim.b.copilot_suggestion_hidden = false + --end) require 'mason-lspconfig'.setup({ ensure_installed = { 'angularls', @@ -269,6 +282,7 @@ return { 'svelte', 'tailwindcss', 'tinymist', + 'ts_ls', --'vtsls', 'yamlls', },