Replacing copilot.vim with copilot.lua with cmp integration

This commit is contained in:
2024-02-28 14:46:18 +01:00
parent 948039bfb6
commit faeb00736b
4 changed files with 19 additions and 15 deletions

View File

@@ -6,7 +6,8 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"copilot.vim": { "branch": "release", "commit": "69455be5d4a892206bc08365ba3648a597485943" },
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" },
"harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },

View File

@@ -23,7 +23,6 @@ vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
vim.keymap.set("i", "<C-c>", "<Esc>")
vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
vim.keymap.set("n", "<leader>qf", vim.lsp.buf.code_action)
vim.keymap.set("n", "<leader>r", "e!")
@@ -36,9 +35,6 @@ vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.dotfiles/nvim/.config/nvim/lua/theprimeagen/packer.lua<CR>");
vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
vim.keymap.set("n", "<leader><leader>", function()
vim.cmd("so")
end)
@@ -53,8 +49,4 @@ vim.keymap.set("n", "<leader>i", "<cmd>FormatCode<CR>")
vim.keymap.set("n", "<leader>w", "<cmd>w<CR>")
vim.keymap.set("n", "<leader>q", "<cmd>q<CR>")
-- Copilot accept with C-j
vim.g.copilot_no_tab_map = true
vim.api.nvim_set_keymap("i", "<C-J>", 'copilot#Accept("<CR>")', { silent = true, expr = true })

View File

@@ -1,8 +1,17 @@
return {
{ 'github/copilot.vim',
config = function ()
-- Disable copilot by default
vim.g.copilot_enabled = false
end
}
"zbirenbaum/copilot-cmp",
cmd = "Copilot",
event = "InsertEnter",
dependencies = {
'zbirenbaum/copilot.lua',
},
config = function()
-- Disable inline suggestions and panel
require('copilot').setup({
suggestion = { enabled = false },
panel = { enabled = false },
})
-- enable suggesions via cmp panel
require('copilot_cmp').setup({})
end,
}

View File

@@ -128,6 +128,8 @@ return {
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'luasnip' }, -- For luasnip users.
-- Copilot Source
{ name = "copilot", group_index = 2 },
},
{
{ name = 'buffer' },