diff --git a/init.lua b/init.lua
index b3a912bb..e95927ec 100644
--- a/init.lua
+++ b/init.lua
@@ -970,6 +970,8 @@ require('lazy').setup({
           --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
         },
         sources = {
+          { name = 'copilot', group_index = 2 },
+          -- { name = 'copilot' },
           {
             name = 'lazydev',
             -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
diff --git a/justfile b/justfile
new file mode 100644
index 00000000..825cc507
--- /dev/null
+++ b/justfile
@@ -0,0 +1,3 @@
+cleanup:
+    rm -rf ~/.local/state/nvim
+    rm -rf ~/.local/share/nvim
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
index 99eefff4..f7df1b33 100644
--- a/lua/custom/plugins/copilot.lua
+++ b/lua/custom/plugins/copilot.lua
@@ -1,23 +1,43 @@
 return {
+  -- {
+  --   'github/copilot.vim',
+  --   init = function()
+  --     -- vim.g.copilot_enabled = false
+  --     vim.keymap.set('i', '<M-;>', '<Plug>(copilot-accept-word)')
+  --     vim.keymap.set('i', '<M-/>', '<Plug>(copilot-dismiss)')
+  --   end,
+  --   --
+  -- },
   {
-    'github/copilot.vim',
-    init = function()
-      -- vim.g.copilot_enabled = false
-      vim.keymap.set('i', '<M-;>', '<Plug>(copilot-accept-word)')
-      vim.keymap.set('i', '<M-/>', '<Plug>(copilot-dismiss)')
+    'zbirenbaum/copilot.lua',
+    cmd = 'Copilot',
+    build = ':Copilot auth',
+    opts = {
+      suggestion = { enabled = false },
+      panel = { enabled = false },
+      --   filetypes = {
+      --     markdown = true,
+      --     help = true,
+      --   },
+    },
+  },
+  {
+    'zbirenbaum/copilot-cmp',
+    config = function()
+      require('copilot_cmp').setup()
     end,
-    --
   },
   {
     'CopilotC-Nvim/CopilotChat.nvim',
     branch = 'canary',
     dependencies = {
-      { 'github/copilot.vim' }, -- or github/copilot.vim
+      -- { 'github/copilot.vim' }, -- or github/copilot.vim
+      { 'zbirenbaum/copilot.lua' }, -- or github/copilot.vim
       { 'nvim-lua/plenary.nvim' }, -- for curl, log wrapper
     },
     build = 'make tiktoken', -- Only on MacOS or Linux
     opts = {
-      debug = true, -- Enable debugging
+      -- debug = true, -- Enable debugging
       -- See Configuration section for rest
       window = {
         layout = 'float',