feat

ADGEfficiency · Jan 29, 2025 · bb44598 · bb44598
1 parent 4eb302f
commit bb44598
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 27 deletions.
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
@@ -3,6 +3,7 @@
   "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" },
   "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
   "barbar.nvim": { "branch": "master", "commit": "c20691d686addb0d6ea87896d186c082324b01f8" },
+  "blink-cmp-copilot": { "branch": "main", "commit": "5d4ed42c5d7d144012792bb6cc4ac7899a108169" },
   "blink-cmp-dictionary": { "branch": "master", "commit": "07cc2e49bb52ebff4e8b83d1801ad6441edf90a2" },
   "blink-copilot": { "branch": "main", "commit": "02daaf13654e78a6ec63401446d07f8c624f513b" },
   "blink-emoji.nvim": { "branch": "master", "commit": "699493775b61b94ead76841c981a51d3df350ea0" },
@@ -18,6 +19,7 @@
   "cmp-pypi": { "branch": "main", "commit": "a73411e5935caa23c6feab34980bb435deadd482" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
+  "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
   "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" },
   "dbtpal": { "branch": "main", "commit": "c526f65a65063c314d180e79df301b339f080236" },
   "emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" },

diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
@@ -18,12 +18,13 @@ return {
 		dependencies = {
 			"echasnovski/mini.icons",
 			"mikavilpas/blink-ripgrep.nvim",
-			-- "giuxtaposition/blink-cmp-copilot",
+			"giuxtaposition/blink-cmp-copilot",
 			"fang2hou/blink-copilot",
 			"moyiz/blink-emoji.nvim",
 			"rafamadriz/friendly-snippets",
 			"Kaiser-Yang/blink-cmp-dictionary",
 			"nvim-lua/plenary.nvim",
+			"zbirenbaum/copilot-cmp",
 		},
 		version = "*",
 
@@ -93,27 +94,43 @@ return {
 					"dictionary",
 				},
 				providers = {
-					-- copilot = {
-					-- 	name = "copilot",
-					-- 	module = "blink-cmp-copilot",
-					-- 	async = true,
-					-- 	score_offset = 100,
-					-- },
+					-- this does work
 					copilot = {
 						name = "copilot",
-						module = "blink-copilot",
-						score_offset = 100,
+						module = "blink-cmp-copilot",
 						async = true,
-						opts = {
-							max_completions = 3,
-							max_attempts = 4,
-						},
+						score_offset = 100,
+						min_keyword_length = 0,
 					},
+					-- copilot = {
+					-- 	name = "copilot",
+					-- 	module = "blink-copilot",
+					-- 	score_offset = 100,
+					-- 	async = true,
+					-- 	opts = {
+					-- 		max_completions = 3,
+					-- 		max_attempts = 4,
+					-- 		debounce = false,
+					-- 		auto_refresh = {
+					-- 			backward = true,
+					-- 			forward = true,
+					-- 		},
+					-- 	},
+					-- },
+					-- copilot = {
+					-- 	name = "copilot-cmp",
+					-- 	module = "blink.compat.source",
+					-- },
 					buffer = {
 						name = "buffer",
 						module = "blink.cmp.sources.buffer",
 						max_items = 3,
 					},
+					snippets = {
+						module = "blink.cmp.sources.snippets",
+						name = "snippets",
+						max_items = 3,
+					},
 					lsp = {
 						name = "lsp",
 						module = "blink.cmp.sources.lsp",

diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua
@@ -8,27 +8,28 @@ return {
 			suggestion = { enabled = false },
 			panel = { enabled = false },
 			filetypes = {
-				python = true,
-				markdown = true,
-				yaml = true,
-				help = true,
+				["*"] = true,
+				cvs = false,
 				gitcommit = false,
 				gitrebase = false,
+				help = true,
 				hgcommit = false,
+				lua = true,
+				markdown = true,
+				python = true,
 				svn = false,
-				cvs = false,
-				["*"] = true,
+				yaml = true,
 			},
 		},
 	},
-	-- {
-	-- 	"zbirenbaum/copilot-cmp",
-	-- 	event = { "BufEnter" },
-	-- 	dependencies = { "zbirenbaum/copilot.lua" },
-	-- 	config = function()
-	-- 		require("copilot_cmp").setup()
-	-- 	end,
-	-- },
+	{
+		"zbirenbaum/copilot-cmp",
+		event = { "BufEnter" },
+		dependencies = { "zbirenbaum/copilot.lua" },
+		config = function()
+			require("copilot_cmp").setup()
+		end,
+	},
 	{
 		"CopilotC-Nvim/CopilotChat.nvim",
 		branch = "canary",