From faeb00736bde4cc3982349b6f730f43f278bdec0 Mon Sep 17 00:00:00 2001
From: Daniele Pintore <daniele.pintore1@gmail.com>
Date: Wed, 28 Feb 2024 14:46:18 +0100
Subject: [PATCH] Replacing copilot.vim with copilot.lua with cmp integration

---
 .config/nvim/lazy-lock.json          |  3 ++-
 .config/nvim/lua/configs/remap.lua   |  8 --------
 .config/nvim/lua/plugins/copilot.lua | 21 +++++++++++++++------
 .config/nvim/lua/plugins/lsp.lua     |  2 ++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 93f1c1d..eb899ff 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -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" },
diff --git a/.config/nvim/lua/configs/remap.lua b/.config/nvim/lua/configs/remap.lua
index bcfb19d..38fb3d4 100644
--- a/.config/nvim/lua/configs/remap.lua
+++ b/.config/nvim/lua/configs/remap.lua
@@ -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 })
-
 
diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua
index 68f00b1..0541de3 100644
--- a/.config/nvim/lua/plugins/copilot.lua
+++ b/.config/nvim/lua/plugins/copilot.lua
@@ -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,
 }
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 25704f5..36c617b 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -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' },