Skip to content

Commit

Permalink
feat: add diffview integrations
Browse files Browse the repository at this point in the history
  • Loading branch information
m00p1ng committed Apr 30, 2024
1 parent a1439ad commit 3aaeb7d
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 0 deletions.
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,20 @@ dashboard = true
</tr>
<!-- dashboard-nvim -->

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

```lua
diffview = true
```

</td>
</tr>
<!-- diffview.nvim -->

<!-- dropbar.nvim -->
</tr>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions doc/catppuccin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ dashboard-nvim>lua
dashboard = true
<

diffview.nvim>lua
diffview = false


dropbar.nvim>lua
dropbar = {
enabled = false,
Expand Down
51 changes: 51 additions & 0 deletions lua/catppuccin/groups/integrations/diffview.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
local M = {}

function M.get()
return {
DiffviewDim1 = { link = "Comment" },
DiffviewPrimary = { fg = C.blue },
DiffviewSecondary = { fg = C.green },
DiffviewNormal = { fg = C.text, bg = O.transparent_background and C.none or C.mantle },
DiffviewNonText = { link = "NonText" },
DiffviewCursorLine = { link = "CursorLine" },
DiffviewWinSeparator = {
fg = O.transparent_background and C.surface1 or C.base,
bg = O.transparent_background and C.none or C.base,
},
DiffviewSignColumn = { link = "Normal" },
DiffviewStatusLine = { link = "StatusLine" },
DiffviewStatusLineNC = { link = "StatusLineNC" },
DiffviewEndOfBuffer = { link = "EndOfBuffer" },
DiffviewFilePanelTitle = { fg = C.blue, style = { "bold" } },
DiffviewFilePanelCounter = { fg = C.text },
DiffviewFilePanelRootPath = { fg = C.lavender, style = { "bold" } },
DiffviewFilePanelFileName = { fg = C.text },
DiffviewFilePanelSelected = { fg = C.yellow },
DiffviewFilePanelPath = { link = "Comment" },
DiffviewFilePanelInsertions = { fg = C.green },
DiffviewFilePanelDeletions = { fg = C.red },
DiffviewFilePanelConflicts = { fg = C.yellow },
DiffviewFolderName = { fg = C.blue, style = { "bold" } },
DiffviewFolderSign = { fg = C.blue },
DiffviewHash = { fg = C.flamingo },
DiffviewReference = { fg = C.blue, style = { "bold" } },
DiffviewReflogSelector = { fg = C.pink },
DiffviewStatusAdded = { fg = C.green },
DiffviewStatusUntracked = { fg = C.green },
DiffviewStatusModified = { fg = C.yellow },
DiffviewStatusRenamed = { fg = C.yellow },
DiffviewStatusCopied = { fg = C.yellow },
DiffviewStatusTypeChange = { fg = C.yellow },
DiffviewStatusUnmerged = { fg = C.yellow },
DiffviewStatusUnknown = { fg = C.red },
DiffviewStatusDeleted = { fg = C.red },
DiffviewStatusBroken = { fg = C.red },
DiffviewStatusIgnored = { fg = C.overlay0 },
DiffviewDiffAdd = { link = "DiffAdd" },
DiffviewDiffDelete = { link = "DiffDelete" },
DiffviewDiffChange = { link = "DiffChange" },
DiffviewDiffText = { link = "DiffText" },
}
end

return M
1 change: 1 addition & 0 deletions lua/catppuccin/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ local M = {
dap = true,
dap_ui = true,
dashboard = true,
diffview = false,
flash = true,
gitsigns = true,
markdown = true,
Expand Down
1 change: 1 addition & 0 deletions lua/catppuccin/types.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
---@field dap boolean?
---@field dap_ui boolean?
---@field dashboard boolean?
---@field diffview boolean?
---@field dropbar CtpIntegrationDropbar | boolean?
---@field fern boolean?
-- Set `notification.window.winblend` to `0` in your `fidget` config:
Expand Down

0 comments on commit 3aaeb7d

Please sign in to comment.