Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
vollowx authored Nov 23, 2024
2 parents 2089a0d + acb744d commit 2f9d1dd
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 1 deletion.
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ This port of <a href="https://github.com/catppuccin/">Catppuccin</a> is special
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 }
```

[mini.deps](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-deps.md)
```lua
add({ source = "catppuccin/nvim", name = "catppuccin" })
```

[packer.nvim](https://github.com/wbthomason/packer.nvim)
```lua
use { "catppuccin/nvim", as = "catppuccin" }
Expand Down Expand Up @@ -1042,6 +1047,20 @@ cmp = true
</tr>
<!-- nvim-cmp -->

<!-- nvim-copilot-vim -->
</tr>
<tr>
<td> <a href="https://github.com/github/copilot.vim">copilot.vim</a> </td>
<td>

```lua
copilot_vim = false,
```

</td>
</tr>
<!-- nvim-copilot-vim -->

<!-- nvim-dap -->
</tr>
<tr>
Expand Down
11 changes: 11 additions & 0 deletions doc/catppuccin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ lazy.nvim <https://github.com/folke/lazy.nvim>
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 }
<

mini.deps
<https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-deps.md>

>lua
add({ source = "catppuccin/nvim", name = "catppuccin" })
<

packer.nvim <https://github.com/wbthomason/packer.nvim>

>lua
Expand Down Expand Up @@ -672,6 +679,10 @@ nvim-cmp>lua
cmp = true
<

copilot.vim>lua
copilot_vim = false,
<

nvim-dap>lua
dap = true
<
Expand Down
1 change: 1 addition & 0 deletions lua/catppuccin/groups/integrations/blink_cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ function M.get()
BlinkCmpLabel = { fg = C.overlay2 },
BlinkCmpLabelDeprecated = { fg = C.overlay0, style = { "strikethrough" } },

BlinkCmpLabelMatch = { fg = C.text, style = { "bold" } },
BlinkCmpKindText = { fg = C.green },
BlinkCmpKindMethod = { fg = C.blue },
BlinkCmpKindFunction = { fg = C.blue },
Expand Down
10 changes: 10 additions & 0 deletions lua/catppuccin/groups/integrations/copilot_vim.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
local M = {}

function M.get()
return {
CopilotSuggestion = { fg = C.overlay0 },
CopilotAnnotation = { fg = C.blue },
}
end

return M
3 changes: 2 additions & 1 deletion lua/catppuccin/types.lua
Original file line number Diff line number Diff line change
Expand Up @@ -121,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
--
Expand Down

0 comments on commit 2f9d1dd

Please sign in to comment.