Brought back supermavengit add -A!

This commit is contained in:
2026-04-23 09:21:51 -04:00
parent 47137191dd
commit 210bdbdddc
+37 -23
View File
@@ -35,7 +35,8 @@ return {
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
{ name = 'copilot' }, { name = 'supermaven' },
--{ name = 'copilot' },
}, { }, {
{ name = 'buffer', keyword_length = 4 }, { name = 'buffer', keyword_length = 4 },
{ name = 'path' }, { name = 'path' },
@@ -46,7 +47,10 @@ return {
format = lspkind.cmp_format({ format = lspkind.cmp_format({
mode = 'symbol', mode = 'symbol',
maxwidth = { menu = 50, abbr = 50 }, maxwidth = { menu = 50, abbr = 50 },
symbol_map = { Copilot = '' }, symbol_map = {
Copilot = '',
Supermaven = "",
},
ellipsis_char = '...', ellipsis_char = '...',
show_labelDetails = true, show_labelDetails = true,
before = function(_, vim_item) before = function(_, vim_item)
@@ -104,11 +108,20 @@ return {
{ 'nvim-lua/plenary.nvim' }, { 'nvim-lua/plenary.nvim' },
{ 'hrsh7th/cmp-path' }, { 'hrsh7th/cmp-path' },
{ {
'zbirenbaum/copilot-cmp', 'supermaven-inc/supermaven-nvim',
config = function() config = function()
require 'copilot_cmp'.setup() require'supermaven-nvim'.setup({
disable_inline_completion = true,
disable_keymaps = true,
})
end, end,
}, },
--{
--'zbirenbaum/copilot-cmp',
--config = function()
--require 'copilot_cmp'.setup()
--end,
--},
{ 'hrsh7th/cmp-buffer' }, { 'hrsh7th/cmp-buffer' },
{ 'hrsh7th/cmp-emoji' }, { 'hrsh7th/cmp-emoji' },
{ 'SergioRibera/cmp-dotenv' }, { 'SergioRibera/cmp-dotenv' },
@@ -180,19 +193,19 @@ return {
version = 'v2.*', version = 'v2.*',
build = 'make install_jsregexp', build = 'make install_jsregexp',
}, },
{ --{
'zbirenbaum/copilot.lua', --'zbirenbaum/copilot.lua',
cmd = 'Copilot', --cmd = 'Copilot',
event = 'InsertEnter', --event = 'InsertEnter',
config = function() --config = function()
require 'copilot'.setup({ --require 'copilot'.setup({
-- Disable native ghost text so copilot-cmp can manage suggestions instead ---- Disable native ghost text so copilot-cmp can manage suggestions instead
suggestion = { enabled = false }, --suggestion = { enabled = false },
panel = { enabled = false }, --panel = { enabled = false },
}) --})
end, --end,
}, --},
{ 'AndreM222/copilot-lualine' }, --{ 'AndreM222/copilot-lualine' },
{ {
'windwp/nvim-autopairs', 'windwp/nvim-autopairs',
event = 'InsertEnter', event = 'InsertEnter',
@@ -229,12 +242,12 @@ return {
) )
local cmp_autopairs = require 'nvim-autopairs.completion.cmp' local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
cmp.event:on('menu_opened', function() --cmp.event:on('menu_opened', function()
vim.b.copilot_suggestion_hidden = true --vim.b.copilot_suggestion_hidden = true
end) --end)
cmp.event:on('menu_closed', function() --cmp.event:on('menu_closed', function()
vim.b.copilot_suggestion_hidden = false --vim.b.copilot_suggestion_hidden = false
end) --end)
require 'mason-lspconfig'.setup({ require 'mason-lspconfig'.setup({
ensure_installed = { ensure_installed = {
'angularls', 'angularls',
@@ -269,6 +282,7 @@ return {
'svelte', 'svelte',
'tailwindcss', 'tailwindcss',
'tinymist', 'tinymist',
'ts_ls',
--'vtsls', --'vtsls',
'yamlls', 'yamlls',
}, },