dev (refactor): siplified git and diff relation in the integrations

dev-doc
Pocco81 3 years ago
parent 656e698995
commit 54fd92d443

@ -2,9 +2,9 @@ local M = {}
function M.get(cpt) function M.get(cpt)
return { return {
GitGutterAdd = { fg = cpt.gitSigns.add }, -- diff mode: Added line |diff.txt| GitGutterAdd = { fg = cpt.diff.add },
GitGutterChange = { fg = cpt.gitSigns.change }, -- diff mode: Changed line |diff.txt| GitGutterChange = { fg = cpt.diff.change },
GitGutterDelete = { fg = cpt.gitSigns.delete }, -- diff mode: Deleted line |diff.txt| GitGutterDelete = { fg = cpt.diff.delete },
} }
end end
return M return M

@ -1,10 +1,11 @@
local M = {} local M = {}
local util = require("catppuccino.utils.util")
function M.get(cpt) function M.get(cpt)
return { return {
GitSignsAdd = { fg = cpt.diff.add, bg = cpt.bg }, -- diff mode: Added line |diff.txt| GitSignsAdd = { fg = util.darken(cpt.diff.add, 0.50), bg = cpt.bg }, -- diff mode: Added line |diff.txt|
GitSignsChange = { fg = cpt.diff.change, bg = cpt.bg }, -- diff mode: Changed line |diff.txt| GitSignsChange = { fg = util.darken(cpt.diff.change, 0.50), bg = cpt.bg }, -- diff mode: Changed line |diff.txt|
GitSignsDelete = { fg = cpt.diff.delete, bg = cpt.bg }, -- diff mode: Deleted line |diff.txt| GitSignsDelete = { fg = util.darken(cpt.diff.delete, 0.50), bg = cpt.bg }, -- diff mode: Deleted line |diff.txt|
} }
end end

@ -1,5 +1,5 @@
local util = require("catppuccino.utils.util")
local M = {} local M = {}
local util = require("catppuccino.utils.util")
function M.get(cpt) function M.get(cpt)
return { return {
@ -8,8 +8,8 @@ function M.get(cpt)
NeogitHunkHeader = { bg = cpt.bg_highlight, fg = cpt.fg }, NeogitHunkHeader = { bg = cpt.bg_highlight, fg = cpt.fg },
NeogitHunkHeaderHighlight = { bg = cpt.fg_gutter, fg = cpt.blue }, NeogitHunkHeaderHighlight = { bg = cpt.fg_gutter, fg = cpt.blue },
NeogitDiffContextHighlight = { bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt }, NeogitDiffContextHighlight = { bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt },
NeogitDiffDeleteHighlight = { fg = cpt.git.delete, bg = cpt.diff.delete }, NeogitDiffDeleteHighlight = { fg = cpt.diff.delete, bg = cpt.bg },
NeogitDiffAddHighlight = { fg = cpt.git.add, bg = cpt.diff.add }, NeogitDiffAddHighlight = { fg = cpt.diff.add, bg = cpt.bg },
} }
end end

@ -20,9 +20,9 @@ function M.get(cpt)
NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
NvimTreeSymlink = { fg = cpt.magenta }, NvimTreeSymlink = { fg = cpt.magenta },
NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black }, NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black },
NvimTreeGitDirty = { fg = cpt.git.change }, NvimTreeGitDirty = { fg = cpt.diff.change },
NvimTreeGitNew = { fg = cpt.git.add }, NvimTreeGitNew = { fg = cpt.diff.add },
NvimTreeGitDeleted = { fg = cpt.git.delete }, NvimTreeGitDeleted = { fg = cpt.diff.delete },
NvimTreeSpecialFile = { fg = cpt.cyan }, NvimTreeSpecialFile = { fg = cpt.cyan },
NvimTreeImageFile = { fg = cpt.fg_sidebar }, NvimTreeImageFile = { fg = cpt.fg_sidebar },
NvimTreeOpenedFile = { fg = cpt.magenta }, NvimTreeOpenedFile = { fg = cpt.magenta },

Loading…
Cancel
Save