From 65e81d3c0b96dead3f75b38aafa24b99fec0dd25 Mon Sep 17 00:00:00 2001
From: frumsy <frumsy@users.noreply.github.com>
Date: Sat, 18 Nov 2023 13:30:11 -0500
Subject: [PATCH] xget copilot working in neovim

---
 lazy-lock.json              | 3 +++
 lua/custom/plugins/init.lua | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index e22e9178..153c439c 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,7 +2,10 @@
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "1f4ad8bb72bdeb60975e98652636b991a9b7475d" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+<<<<<<< HEAD
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+=======
+>>>>>>> 4effd4b (get copilot working in neovim)
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "fidget.nvim": { "branch": "main", "commit": "bd0b8b644d4fb293dc4df2718b1f2df3abd90767" },
   "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8..b0602212 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -2,4 +2,11 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
-return {}
+return {
+	"github/copilot.vim",
+	cmd = "Copilot",
+	event = "InsertEnter",
+	config = function()
+		require("copilot").setup({})
+	end,
+}