github/neovim-rose-pine
1
0
Fork 0
mirror of https://github.com/rose-pine/neovim.git synced 2025-10-15 12:38:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix nil git groups

Browse source
This commit is contained in:
mvllow 2022-02-05 13:12:32 -06:00
commit d1b5f5ccf2
2 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lua/rose-pine/init.lua
View file

@ -68,17 +68,15 @@ function M.setup(opts)
info = 'foam', info = 'foam',
warn = 'gold', warn = 'gold',
git = { git_add = 'foam',
add = 'foam', git_change = 'rose',
change = 'rose', git_delete = 'love',
delete = 'love', git_dirty = 'rose',
dirty = 'rose', git_ignore = 'muted',
ignore = 'muted', git_merge = 'iris',
merge = 'iris', git_rename = 'pine',
rename = 'pine', git_stage = 'iris',
stage = 'iris', git_text = 'rose',
text = 'rose',
},
headings = { headings = {
h1 = 'iris', h1 = 'iris',

28
lua/rose-pine/theme.lua
View file

@ -5,7 +5,7 @@ local M = {}
function M.get(config) function M.get(config)
local theme = {} local theme = {}
local groups = config.groups or {} local groups = config.groups
local colors = palette[config.variant or 'main'] local colors = palette[config.variant or 'main']
local styles = { local styles = {
italic = (config.disable_italics and 'italic') or 'NONE', italic = (config.disable_italics and 'italic') or 'NONE',
@ -25,10 +25,10 @@ function M.get(config)
CursorLineNr = { fg = colors.text }, CursorLineNr = { fg = colors.text },
DarkenedPanel = { bg = colors.surface }, DarkenedPanel = { bg = colors.surface },
DarkenedStatusline = { bg = colors.surface }, DarkenedStatusline = { bg = colors.surface },
DiffAdd = { bg = blend(groups.git.add, colors.base, 0.5) }, DiffAdd = { bg = blend(groups.git_add, colors.base, 0.5) },
DiffChange = { bg = colors.overlay }, DiffChange = { bg = colors.overlay },
DiffDelete = { bg = blend(groups.git.delete, colors.base, 0.5) }, DiffDelete = { bg = blend(groups.git_delete, colors.base, 0.5) },
DiffText = { bg = blend(groups.git.text, colors.base, 0.5) }, DiffText = { bg = blend(groups.git_text, colors.base, 0.5) },
diffAdded = { link = 'DiffAdd' }, diffAdded = { link = 'DiffAdd' },
diffChanged = { link = 'DiffChange' }, diffChanged = { link = 'DiffChange' },
diffRemoved = { link = 'DiffDelete' }, diffRemoved = { link = 'DiffDelete' },
@ -255,9 +255,9 @@ function M.get(config)
BufferVisibleTarget = { fg = colors.gold }, BufferVisibleTarget = { fg = colors.gold },
-- lewis6991/gitsigns.nvim -- lewis6991/gitsigns.nvim
GitSignsAdd = { fg = groups.git.add }, GitSignsAdd = { fg = groups.git_add },
GitSignsChange = { fg = groups.git.change }, GitSignsChange = { fg = groups.git_change },
GitSignsDelete = { fg = groups.git.delete }, GitSignsDelete = { fg = groups.git_delete },
SignAdd = { link = 'GitSignsAdd' }, SignAdd = { link = 'GitSignsAdd' },
SignChange = { link = 'GitSignsChange' }, SignChange = { link = 'GitSignsChange' },
SignDelete = { link = 'GitSignsDelete' }, SignDelete = { link = 'GitSignsDelete' },
@ -278,13 +278,13 @@ function M.get(config)
NvimTreeFileStaged = { fg = colors.iris }, NvimTreeFileStaged = { fg = colors.iris },
NvimTreeFolderIcon = { fg = colors.subtle }, NvimTreeFolderIcon = { fg = colors.subtle },
NvimTreeFolderName = { fg = colors.foam }, NvimTreeFolderName = { fg = colors.foam },
NvimTreeGitDeleted = { fg = groups.git.delete }, NvimTreeGitDeleted = { fg = groups.git_delete },
NvimTreeGitDirty = { fg = groups.git.dirty }, NvimTreeGitDirty = { fg = groups.git_dirty },
NvimTreeGitIgnored = { fg = groups.git.ignore }, NvimTreeGitIgnored = { fg = groups.git_ignore },
NvimTreeGitMerge = { fg = groups.git.merge }, NvimTreeGitMerge = { fg = groups.git_merge },
NvimTreeGitNew = { fg = groups.git.add }, NvimTreeGitNew = { fg = groups.git_add },
NvimTreeGitRenamed = { fg = groups.git.rename }, NvimTreeGitRenamed = { fg = groups.git_rename },
NvimTreeGitStaged = { fg = groups.git.stage }, NvimTreeGitStaged = { fg = groups.git_stage },
NvimTreeImageFile = { fg = colors.text }, NvimTreeImageFile = { fg = colors.text },
NvimTreeNormal = { fg = colors.text }, NvimTreeNormal = { fg = colors.text },
NvimTreeOpenedFile = { fg = colors.text, bg = colors.highlight_med }, NvimTreeOpenedFile = { fg = colors.text, bg = colors.highlight_med },