From c32565a48bd7582b947b3456c58efd9a6ff3a1b7 Mon Sep 17 00:00:00 2001
From: Thomas Alcala Schneider <thomas@lockrmail.com>
Date: Mon, 27 Mar 2023 19:16:35 +0200
Subject: [PATCH 1/2] wip: make cmp use copilot

---
 lua/custom/plugins/{cmp-copilot.lua => copilot-cmp.lua} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename lua/custom/plugins/{cmp-copilot.lua => copilot-cmp.lua} (66%)

diff --git a/lua/custom/plugins/cmp-copilot.lua b/lua/custom/plugins/copilot-cmp.lua
similarity index 66%
rename from lua/custom/plugins/cmp-copilot.lua
rename to lua/custom/plugins/copilot-cmp.lua
index 2b351188..43efa3fd 100644
--- a/lua/custom/plugins/cmp-copilot.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -1,11 +1,12 @@
 return {
-  'hrsh7th/cmp-copilot',
+  'zbirenbaum/copilot-cmp',
+  dependencies = { 'copilot.lua' },
   config = function()
+    require('copilot_cmp').setup()
     local cmp = require 'cmp'
     local config = cmp.get_config()
     table.insert(config.sources, {
       name = 'copilot',
-      option = {},
     })
     cmp.setup(config)
   end,

From e53d56f2fef2ee1937360143fa1952cb6560b159 Mon Sep 17 00:00:00 2001
From: Thomas Alcala Schneider <thomas@lockrmail.com>
Date: Tue, 28 Mar 2023 16:27:14 +0200
Subject: [PATCH 2/2] feat: adding back cmp-copilot

---
 lua/custom/plugins/cmp-copilot.lua  | 12 ++++++++++++
 lua/custom/plugins/cmp-nvim-lsp.lua |  1 -
 lua/custom/plugins/copilot-cmp.lua  |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 lua/custom/plugins/cmp-copilot.lua

diff --git a/lua/custom/plugins/cmp-copilot.lua b/lua/custom/plugins/cmp-copilot.lua
new file mode 100644
index 00000000..55bb06a9
--- /dev/null
+++ b/lua/custom/plugins/cmp-copilot.lua
@@ -0,0 +1,12 @@
+return {
+  'hrsh7th/cmp-copilot',
+  dependencies = { 'zbirenbaum/copilot.lua', 'github/copilot.vim' },
+  config = function()
+    local cmp = require 'cmp'
+    local config = cmp.get_config()
+    table.insert(config.sources, {
+      name = 'copilot',
+    })
+    cmp.setup(config)
+  end,
+}
diff --git a/lua/custom/plugins/cmp-nvim-lsp.lua b/lua/custom/plugins/cmp-nvim-lsp.lua
index 0eed532e..df5d4091 100644
--- a/lua/custom/plugins/cmp-nvim-lsp.lua
+++ b/lua/custom/plugins/cmp-nvim-lsp.lua
@@ -5,7 +5,6 @@ return {
     local config = cmp.get_config()
     table.insert(config.sources, {
       name = 'nvim_lsp',
-      option = {},
     })
     cmp.setup(config)
   end,
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 43efa3fd..78a08f74 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -1,6 +1,6 @@
 return {
   'zbirenbaum/copilot-cmp',
-  dependencies = { 'copilot.lua' },
+  dependencies = { 'zbirenbaum/copilot.lua', 'github/copilot.vim' },
   config = function()
     require('copilot_cmp').setup()
     local cmp = require 'cmp'