From ef96c8de23d795a3874e7d31bbfdbc76c7b751be Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Fri, 13 Dec 2024 17:00:01 -0500 Subject: [PATCH] AutoYADM commit: 2024-12-13 17:00:01 --- .config/nvim/lua/plugins/blink.lua | 15 +++++++----- .config/nvim/lua/plugins/copilot.lua | 36 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua index e2725689..f129647f 100644 --- a/.config/nvim/lua/plugins/blink.lua +++ b/.config/nvim/lua/plugins/blink.lua @@ -4,11 +4,9 @@ if follow_main then end return { - -- { "giuxtaposition/blink-cmp-copilot", enabled = false }, + { "giuxtaposition/blink-cmp-copilot", enabled = false }, { "saghen/blink.cmp", - ---@module 'blink.cmp' - ---@type blink.cmp.Config opts = { appearance = { nerd_font_variant = "mono", @@ -17,7 +15,7 @@ return { accept = { -- experimental auto-brackets support auto_brackets = { - enabled = true, + enabled = false, }, }, menu = { @@ -28,15 +26,19 @@ return { documentation = { auto_show = true, auto_show_delay_ms = 200, - treesitter_highlighting = true, + treesitter_highlighting = false, window = { - winhighlight = "Normal:BlinkCmpDoc,FloatBorder:BlinkCmpDocBorder,CursorLine:BlinkCmpDocCursorLine,Search:None", + -- winhighlight = "Normal:BlinkCmpDoc,FloatBorder:BlinkCmpDocBorder,CursorLine:BlinkCmpDocCursorLine,Search:None", }, }, ghost_text = { enabled = vim.g.ai_cmp, + -- enabled = false, }, }, + sources = { + default = { "lsp", "path", "snippets", "buffer" }, + }, keymap = { preset = "default", @@ -44,6 +46,7 @@ return { -- LazyVim.cmp.map({ "snippet_forward", "ai_accept" }), -- "fallback", -- }, + [""] = { "fallback" }, [""] = { "select_and_accept", "fallback" }, [""] = { "select_prev" }, [""] = { "select_next" }, diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua index f24d841a..76d11e2a 100644 --- a/.config/nvim/lua/plugins/copilot.lua +++ b/.config/nvim/lua/plugins/copilot.lua @@ -3,24 +3,24 @@ return { "zbirenbaum/copilot-cmp", enabled = false, opts = function() - require("copilot.command").disable() - local cptoggle = Snacks.toggle.new({ - name = "Copilot", - -- map = vim.keymap.set, - which_key = true, - get = function() - return not require("copilot.client").is_disabled() - end, - notify = true, - set = function(state) - if state then - require("copilot.command").enable() - else - require("copilot.command").disable() - end - end, - }) - Snacks.toggle.map(cptoggle, "at", { desc = "Toggle Copilot" }) + -- require("copilot.command").disable() + -- local cptoggle = Snacks.toggle.new({ + -- name = "Copilot", + -- -- map = vim.keymap.set, + -- which_key = true, + -- get = function() + -- return not require("copilot.client").is_disabled() + -- end, + -- notify = true, + -- set = function(state) + -- if state then + -- require("copilot.command").enable() + -- else + -- require("copilot.command").disable() + -- end + -- end, + -- }) + -- Snacks.toggle.map(cptoggle, "at", { desc = "Toggle Copilot" }) end, }, { "CopilotC-Nvim/CopilotChat.nvim", opts = {