From 3aaeb7d5e6d8e6d73bd09c5d9e62d8459062b3fc Mon Sep 17 00:00:00 2001 From: m00p1ng Date: Tue, 30 Apr 2024 13:17:23 +0700 Subject: [PATCH] feat: add diffview integrations --- README.md | 14 +++++ doc/catppuccin.txt | 4 ++ .../groups/integrations/diffview.lua | 51 +++++++++++++++++++ lua/catppuccin/init.lua | 1 + lua/catppuccin/types.lua | 1 + 5 files changed, 71 insertions(+) create mode 100644 lua/catppuccin/groups/integrations/diffview.lua diff --git a/README.md b/README.md index b88b8d07..1d4f55c4 100644 --- a/README.md +++ b/README.md @@ -472,6 +472,20 @@ dashboard = true + + + + diffview.nvim + + +```lua +diffview = true +``` + + + + + diff --git a/doc/catppuccin.txt b/doc/catppuccin.txt index a4a4f9d8..44dc772f 100644 --- a/doc/catppuccin.txt +++ b/doc/catppuccin.txt @@ -383,6 +383,10 @@ dashboard-nvim>lua dashboard = true < +diffview.nvim>lua + diffview = false + + dropbar.nvim>lua dropbar = { enabled = false, diff --git a/lua/catppuccin/groups/integrations/diffview.lua b/lua/catppuccin/groups/integrations/diffview.lua new file mode 100644 index 00000000..ead89081 --- /dev/null +++ b/lua/catppuccin/groups/integrations/diffview.lua @@ -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 diff --git a/lua/catppuccin/init.lua b/lua/catppuccin/init.lua index da9ecb66..5101d376 100644 --- a/lua/catppuccin/init.lua +++ b/lua/catppuccin/init.lua @@ -43,6 +43,7 @@ local M = { dap = true, dap_ui = true, dashboard = true, + diffview = false, flash = true, gitsigns = true, markdown = true, diff --git a/lua/catppuccin/types.lua b/lua/catppuccin/types.lua index 22da8abc..461eda29 100644 --- a/lua/catppuccin/types.lua +++ b/lua/catppuccin/types.lua @@ -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: