From c85e8e800b473aac9e642f4cff1125c38e7287ec Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sat, 9 Nov 2024 17:15:36 -0600 Subject: [PATCH 1/5] feat: add copilot.vim support --- lua/catppuccin/groups/integrations/copilot_vim.lua | 10 ++++++++++ lua/catppuccin/init.lua | 1 + lua/catppuccin/types.lua | 1 + 3 files changed, 12 insertions(+) create mode 100644 lua/catppuccin/groups/integrations/copilot_vim.lua diff --git a/lua/catppuccin/groups/integrations/copilot_vim.lua b/lua/catppuccin/groups/integrations/copilot_vim.lua new file mode 100644 index 00000000..8d9c2dd6 --- /dev/null +++ b/lua/catppuccin/groups/integrations/copilot_vim.lua @@ -0,0 +1,10 @@ +local M = {} + +function M.get() + return { + CopilotSuggestion = { fg = C.subtext0 }, + CopilotAnnotation = { fg = C.blue }, + } +end + +return M diff --git a/lua/catppuccin/init.lua b/lua/catppuccin/init.lua index ce0d577b..112578c4 100644 --- a/lua/catppuccin/init.lua +++ b/lua/catppuccin/init.lua @@ -40,6 +40,7 @@ local M = { integrations = { alpha = true, cmp = true, + copilot_vim = true, dap = true, dap_ui = true, dashboard = true, diff --git a/lua/catppuccin/types.lua b/lua/catppuccin/types.lua index b8f3f737..e7d98fd8 100644 --- a/lua/catppuccin/types.lua +++ b/lua/catppuccin/types.lua @@ -105,6 +105,7 @@ ---@class CtpIntegrations ---@field aerial boolean? ---@field alpha boolean? +---@field copilot_vim boolean? ---@field barbar boolean? -- Use this to set it up: -- From b55c5b5fedcbe52000b9188d456141ef2af4fd26 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Wed, 13 Nov 2024 16:05:22 -0600 Subject: [PATCH 2/5] chore: alphabetize the field types --- lua/catppuccin/types.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/catppuccin/types.lua b/lua/catppuccin/types.lua index e7d98fd8..f2b4dc08 100644 --- a/lua/catppuccin/types.lua +++ b/lua/catppuccin/types.lua @@ -105,7 +105,6 @@ ---@class CtpIntegrations ---@field aerial boolean? ---@field alpha boolean? ----@field copilot_vim boolean? ---@field barbar boolean? -- Use this to set it up: -- @@ -122,11 +121,12 @@ ---@field barbecue CtpIntegrationBarbecue | boolean? ---@field beacon boolean? ---@field blink_cmp boolean? ----@field colorful_winsep CtpIntegrationColorfulWinsep | boolean? ---@field cmp boolean? -- `coc.nvim` links to `native_lsp` highlight groups, so you can use -- `native_lsp.virtual_text` and `native_lsp.underlines` to style diagnostics. ---@field coc_nvim boolean? +---@field colorful_winsep CtpIntegrationColorfulWinsep | boolean? +---@field copilot_vim boolean? -- ```lua -- local sign = vim.fn.sign_define -- From 0339ccc41c5ddf1489ffe8bb4492a2fb6b297448 Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sun, 17 Nov 2024 22:59:17 -0600 Subject: [PATCH 3/5] feat: switch to overlay0 for the virtual suggestion text --- lua/catppuccin/groups/integrations/copilot_vim.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/groups/integrations/copilot_vim.lua b/lua/catppuccin/groups/integrations/copilot_vim.lua index 8d9c2dd6..1f8764ac 100644 --- a/lua/catppuccin/groups/integrations/copilot_vim.lua +++ b/lua/catppuccin/groups/integrations/copilot_vim.lua @@ -2,7 +2,7 @@ local M = {} function M.get() return { - CopilotSuggestion = { fg = C.subtext0 }, + CopilotSuggestion = { fg = C.overlay0 }, CopilotAnnotation = { fg = C.blue }, } end From 5af1ed2d2095828759ebea8921680cf27edd526b Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Sun, 17 Nov 2024 23:07:21 -0600 Subject: [PATCH 4/5] docs: Add `copilot_vim` to the integrations section --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index c2b50ef2..d76e48ff 100644 --- a/README.md +++ b/README.md @@ -1047,6 +1047,20 @@ cmp = true + + + + copilot.vim + + +```lua +copilot_vim = true, +``` + + + + + From 20ff50270d4cb9537230a22d14686aad5061e0fe Mon Sep 17 00:00:00 2001 From: Josh Medeski Date: Wed, 20 Nov 2024 10:09:03 -0600 Subject: [PATCH 5/5] feat: make copilot vim disabled by default --- README.md | 2 +- lua/catppuccin/init.lua | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d76e48ff..261adf19 100644 --- a/README.md +++ b/README.md @@ -1054,7 +1054,7 @@ cmp = true ```lua -copilot_vim = true, +copilot_vim = false, ``` diff --git a/lua/catppuccin/init.lua b/lua/catppuccin/init.lua index 112578c4..ce0d577b 100644 --- a/lua/catppuccin/init.lua +++ b/lua/catppuccin/init.lua @@ -40,7 +40,6 @@ local M = { integrations = { alpha = true, cmp = true, - copilot_vim = true, dap = true, dap_ui = true, dashboard = true,