move to copilot cmp

5 files changed, 47 insertions, 12 deletions

diff --git a/after/plugin/completition.lua b/after/plugin/completition.lua
index e1b55f6..644b185 100644
--- a/after/plugin/completition.lua
+++ b/after/plugin/completition.lua
@@ -39,6 +39,7 @@ cmp.setup {
     },
     sources = {
         { name = "nvim_lua" },
+        { name = "copilot" },
         { name = "nvim_lsp" },
         { name = "path" },
         { name = "luasnip" },
@@ -72,6 +73,7 @@ cmp.setup {
                 nvim_lua = "[api]",
                 path = "[path]",
                 luasnip = "[snip]",
+                copilot = "[copilot]",
             }
         }
     },
diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua
index e617d12..0b3e6a5 100644
--- a/lua/alpha/plugins.lua
+++ b/lua/alpha/plugins.lua
@@ -97,7 +97,18 @@ return require('packer').startup(function(use)
         'ray-x/lsp_signature.nvim'
     }
 
-    use "github/copilot.vim"
+    -- use "github/copilot.vim"
+    use {
+      "zbirenbaum/copilot.lua",
+      event = "InsertEnter",
+      config = function ()
+        vim.schedule(function() require("copilot").setup() end)
+      end,
+    }
+    use {
+        "zbirenbaum/copilot-cmp",
+        after = {"copilot.lua", "nvim-cmp"},
+    }
 
     use {
         'nvim-telescope/telescope.nvim',
diff --git a/plugin/copilot.vim b/plugin/copilot.vim
deleted file mode 100644
index 44983e5..0000000
--- a/plugin/copilot.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-imap <silent><script><expr> <C-Y> copilot#Accept("\<CR>")
-" let g:copilot_no_tab_map = v:true
diff --git a/plugin/keymaps.vim b/plugin/keymaps.vim
index 15dd082..5c61ff1 100644
--- a/plugin/keymaps.vim
+++ b/plugin/keymaps.vim
@@ -21,6 +21,8 @@ inoremap > ><c-g>u
 vnoremap < <gv
 vnoremap > >gv
 
+vnoremap <leader>s :!sort<CR>
+
 nnoremap <leader>wh :wincmd h<CR>
 nnoremap <leader>wj :wincmd j<CR>
 nnoremap <leader>wk :wincmd k<CR>
diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua
index d2a05fa..a803135 100644
--- a/plugin/packer_compiled.lua
+++ b/plugin/packer_compiled.lua
@@ -114,10 +114,24 @@ _G.packer_plugins = {
     path = "/home/alpha/.local/share/nvim/site/pack/packer/start/colorbuddy.nvim",
     url = "https://github.com/tjdevries/colorbuddy.nvim"
   },
-  ["copilot.vim"] = {
-    loaded = true,
-    path = "/home/alpha/.local/share/nvim/site/pack/packer/start/copilot.vim",
-    url = "https://github.com/github/copilot.vim"
+  ["copilot-cmp"] = {
+    after_files = { "/home/alpha/.local/share/nvim/site/pack/packer/opt/copilot-cmp/after/plugin/copilot_cmp.lua" },
+    load_after = {
+      ["copilot.lua"] = true
+    },
+    loaded = false,
+    needs_bufread = false,
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/opt/copilot-cmp",
+    url = "https://github.com/zbirenbaum/copilot-cmp"
+  },
+  ["copilot.lua"] = {
+    after = { "copilot-cmp" },
+    config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fcopilot\frequire)\1\0\3\0\3\0\0056\0\0\0009\0\1\0003\2\2\0B\0\2\1K\0\1\0\0\rschedule\bvim\0" },
+    loaded = false,
+    needs_bufread = false,
+    only_cond = false,
+    path = "/home/alpha/.local/share/nvim/site/pack/packer/opt/copilot.lua",
+    url = "https://github.com/zbirenbaum/copilot.lua"
   },
   delimitMate = {
     loaded = true,
@@ -447,19 +461,23 @@ time([[Defining packer_plugins]], false)
 time([[Config for nvim-colorizer.lua]], true)
 try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua")
 time([[Config for nvim-colorizer.lua]], false)
--- Config for: nvim-projectconfig
-time([[Config for nvim-projectconfig]], true)
-try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
-time([[Config for nvim-projectconfig]], false)
 -- Config for: git-worktree.nvim
 time([[Config for git-worktree.nvim]], true)
 try_loadstring("\27LJ\2\n>\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\17git-worktree\frequire\0", "config", "git-worktree.nvim")
 time([[Config for git-worktree.nvim]], false)
+-- Config for: nvim-projectconfig
+time([[Config for nvim-projectconfig]], true)
+try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\23nvim-projectconfig\frequire\0", "config", "nvim-projectconfig")
+time([[Config for nvim-projectconfig]], false)
+-- Load plugins in order defined by `after`
+time([[Sequenced loading]], true)
+vim.cmd [[ packadd nvim-cmp ]]
+time([[Sequenced loading]], false)
 
 -- Command lazy-loads
 time([[Defining lazy-load commands]], true)
-pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Http lua require("packer.load")({'vim-http'}, { cmd = "Http", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file VimwikiIndex lua require("packer.load")({'vimwiki'}, { cmd = "VimwikiIndex", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
+pcall(vim.cmd, [[command -nargs=* -range -bang -complete=file Http lua require("packer.load")({'vim-http'}, { cmd = "Http", l1 = <line1>, l2 = <line2>, bang = <q-bang>, args = <q-args>, mods = "<mods>" }, _G.packer_plugins)]])
 time([[Defining lazy-load commands]], false)
 
 vim.cmd [[augroup packer_load_aucmds]]
@@ -468,6 +486,10 @@ vim.cmd [[au!]]
 time([[Defining lazy-load filetype autocommands]], true)
 vim.cmd [[au FileType qf ++once lua require("packer.load")({'nvim-bqf'}, { ft = "qf" }, _G.packer_plugins)]]
 time([[Defining lazy-load filetype autocommands]], false)
+  -- Event lazy-loads
+time([[Defining lazy-load event autocommands]], true)
+vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'copilot.lua'}, { event = "InsertEnter *" }, _G.packer_plugins)]]
+time([[Defining lazy-load event autocommands]], false)
 vim.cmd("augroup END")
 if should_profile then save_profiles() end