DarthMooMancer/min-kanso.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for untracked files in Git signs

Browse Source
This commit is contained in:
Webhooked
2025-05-07 11:34:40 +02:00
parent e5ae0533c5
commit 921f85c99a
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/kanso/colors.lua
+8 -6
View File
@@ -67,12 +67,12 @@ local palette = {
inkGray2 = "#75797f", inkGray2 = "#75797f",
inkGray3 = "#5C6066", inkGray3 = "#5C6066",
inkBlue2 = "#8ba4b0", inkBlue2 = "#8ba4b0",
inkViolet= "#8992a7", inkViolet = "#8992a7",
inkRed = "#c4746e", inkRed = "#c4746e",
inkAqua = "#8ea4a2", inkAqua = "#8ea4a2",
inkAsh = "#5C6068", inkAsh = "#5C6066",
inkTeal = "#949fb5", inkTeal = "#949fb5",
inkYellow = "#c4b28a",--"#a99c8b", inkYellow = "#c4b28a", --"#a99c8b",
-- "#8a9aa3", -- "#8a9aa3",
pearlInk0 = "#24262D", pearlInk0 = "#24262D",
@@ -101,7 +101,7 @@ local palette = {
pearlPink = "#b35b79", pearlPink = "#b35b79",
pearlOrange = "#cc6d00", pearlOrange = "#cc6d00",
pearlOrange2 = "#e98a00", pearlOrange2 = "#e98a00",
pearlYellow ="#77713f", pearlYellow = "#77713f",
pearlYellow2 = "#836f4a", pearlYellow2 = "#836f4a",
pearlYellow3 = "#de9800", pearlYellow3 = "#de9800",
pearlYellow4 = "#f9d791", pearlYellow4 = "#f9d791",
@@ -132,7 +132,8 @@ function M.setup(opts)
local theme = opts.theme or require("kanso")._CURRENT_THEME -- WARN: this fails if called before kanso.load() local theme = opts.theme or require("kanso")._CURRENT_THEME -- WARN: this fails if called before kanso.load()
if not theme then if not theme then
error("kanso.colors.setup(): Unable to infer `theme`. Either specify a theme or call this function after ':colorscheme kanso'") error(
"kanso.colors.setup(): Unable to infer `theme`. Either specify a theme or call this function after ':colorscheme kanso'")
end end
-- Add to and/or override palette_colors -- Add to and/or override palette_colors
@@ -142,7 +143,8 @@ function M.setup(opts)
local theme_colors = require("kanso.themes")[theme](updated_palette_colors) local theme_colors = require("kanso.themes")[theme](updated_palette_colors)
-- Add to and/or override theme_colors -- Add to and/or override theme_colors
local theme_overrides = vim.tbl_deep_extend("force", override_colors.theme["all"] or {}, override_colors.theme[theme] or {} ) local theme_overrides = vim.tbl_deep_extend("force", override_colors.theme["all"] or {},
override_colors.theme[theme] or {})
local updated_theme_colors = vim.tbl_deep_extend("force", theme_colors, theme_overrides) local updated_theme_colors = vim.tbl_deep_extend("force", theme_colors, theme_overrides)
-- return palette_colors AND theme_colors -- return palette_colors AND theme_colors
lua/kanso/highlights/plugins.lua
+4
View File
@@ -25,6 +25,10 @@ function M.setup(colors, config)
GitSignsAdd = { fg = theme.vcs.added, bg = theme.ui.none }, GitSignsAdd = { fg = theme.vcs.added, bg = theme.ui.none },
GitSignsChange = { fg = theme.vcs.changed, bg = theme.ui.none }, GitSignsChange = { fg = theme.vcs.changed, bg = theme.ui.none },
GitSignsDelete = { fg = theme.vcs.removed, bg = theme.ui.none }, GitSignsDelete = { fg = theme.vcs.removed, bg = theme.ui.none },
GitSignsChangedelete = { fg = theme.vcs.removed, bg = theme.ui.none },
GitSignsTopdelete = { fg = theme.vcs.removed, bg = theme.ui.none },
GitSignsUntracked = { fg = theme.vcs.untracked, bg = theme.ui.none },
-- Neogit -- Neogit
NeogitDiffContextHighlight = { bg = theme.diff.change }, --[[ guibg=#333333 guifg=#b2b2b2 ]] NeogitDiffContextHighlight = { bg = theme.diff.change }, --[[ guibg=#333333 guifg=#b2b2b2 ]]
NeogitHunkHeader = { fg = theme.syn.fun }, --[[ guifg=#cccccc guibg=#404040 ]] NeogitHunkHeader = { fg = theme.syn.fun }, --[[ guifg=#cccccc guibg=#404040 ]]
lua/kanso/themes.lua
+13 -9
View File
@@ -41,6 +41,7 @@ local c = require("kanso.lib.color")
---@field added ColorSpec ---@field added ColorSpec
---@field removed ColorSpec ---@field removed ColorSpec
---@field changed ColorSpec ---@field changed ColorSpec
---@field untracked ColorSpec
---@class UiElements ---@class UiElements
---@field none ColorSpec ---@field none ColorSpec
@@ -175,9 +176,10 @@ return {
text = palette.winterYellow, text = palette.winterYellow,
}, },
vcs = { vcs = {
added = palette.autumnGreen, added = palette.autumnGreen,
removed = palette.autumnRed, removed = palette.autumnRed,
changed = palette.autumnYellow, changed = palette.autumnYellow,
untracked = palette.inkGray2
}, },
term = { term = {
palette.zen0, -- black palette.zen0, -- black
@@ -284,9 +286,10 @@ return {
text = palette.winterYellow, text = palette.winterYellow,
}, },
vcs = { vcs = {
added = palette.autumnGreen, added = palette.autumnGreen,
removed = palette.autumnRed, removed = palette.autumnRed,
changed = palette.autumnYellow, changed = palette.autumnYellow,
untracked = palette.inkGray2
}, },
term = { term = {
palette.inkBlack0, -- black palette.inkBlack0, -- black
@@ -379,9 +382,10 @@ return {
special3 = palette.pearlViolet4, special3 = palette.pearlViolet4,
}, },
vcs = { vcs = {
added = palette.pearlGreen2, added = palette.pearlGreen2,
removed = palette.pearlRed2, removed = palette.pearlRed2,
changed = palette.pearlYellow3, changed = palette.pearlYellow3,
untracked = palette.pearlGray4
}, },
diff = { diff = {
add = palette.pearlGreen3, add = palette.pearlGreen3,