mirror of
https://github.com/rose-pine/neovim.git
synced 2025-10-15 12:38:53 +02:00
Merge branch 'main' of https://github.com/rose-pine/neovim into main
This commit is contained in:
commit
82ecae5990
4 changed files with 266 additions and 198 deletions
3
colors/rose-pine.lua
Normal file
3
colors/rose-pine.lua
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
package.loaded['rose-pine.palette'] = nil
|
||||||
|
|
||||||
|
require('rose-pine').colorscheme()
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
lua package.loaded['rose-pine.palette'] = nil
|
|
||||||
|
|
||||||
lua require('rose-pine').colorscheme()
|
|
||||||
|
|
@ -4,202 +4,220 @@
|
||||||
--- @usage
|
--- @usage
|
||||||
--- local highlights = require('rose-pine.plugins.bufferline')
|
--- local highlights = require('rose-pine.plugins.bufferline')
|
||||||
--- require('bufferline').setup({ highlights = highlights })
|
--- require('bufferline').setup({ highlights = highlights })
|
||||||
|
|
||||||
local p = require('rose-pine.palette')
|
local p = require('rose-pine.palette')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
-- fill = {
|
-- fill = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- background = {
|
-- background = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- tab = {
|
-- tab = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- tab_selected = {
|
-- tab_selected = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- tab_close = {
|
-- tab_close = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- close_button = {
|
-- close_button = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- close_button_visible = {
|
-- close_button_visible = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- close_button_selected = {
|
-- close_button_selected = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
buffer_visible = {guifg = p.subtle, guibg = p.base},
|
buffer_visible = {
|
||||||
buffer_selected = {guifg = p.text, guibg = p.surface, gui = 'bold,italic'}
|
fg = p.subtle,
|
||||||
-- diagnostic = {
|
bg = p.base,
|
||||||
-- guifg = '<color-value-here>',
|
},
|
||||||
-- guibg = '<color-value-here>',
|
buffer_selected = {
|
||||||
-- },
|
fg = p.text,
|
||||||
-- diagnostic_visible = {
|
bg = p.surface,
|
||||||
-- guifg = '<color-value-here>',
|
bold = true,
|
||||||
-- guibg = '<color-value-here>',
|
italic = true,
|
||||||
-- },
|
},
|
||||||
-- diagnostic_selected = {
|
-- diagnostic = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- gui = 'bold,italic',
|
-- },
|
||||||
-- },
|
-- diagnostic_visible = {
|
||||||
-- info = {
|
-- fg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- diagnostic_selected = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- info_visible = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bold = true,
|
||||||
-- guibg = '<color-value-here>',
|
-- italic = true,
|
||||||
-- },
|
-- },
|
||||||
-- info_selected = {
|
-- info = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- gui = 'bold,italic',
|
-- bg = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- },
|
||||||
-- },
|
-- info_visible = {
|
||||||
-- info_diagnostic = {
|
-- fg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- info_selected = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- info_diagnostic_visible = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bold = true,
|
||||||
-- guibg = '<color-value-here>',
|
-- italic = true,
|
||||||
-- },
|
-- sp = '<color-value-here>',
|
||||||
-- info_diagnostic_selected = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- info_diagnostic = {
|
||||||
-- guibg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- gui = 'bold,italic',
|
-- sp = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- warning = {
|
-- info_diagnostic_visible = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- },
|
||||||
-- },
|
-- info_diagnostic_selected = {
|
||||||
-- warning_visible = {
|
-- fg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bold = true,
|
||||||
-- },
|
-- italic = true,
|
||||||
-- warning_selected = {
|
-- sp = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- warning = {
|
||||||
-- gui = 'bold,italic',
|
-- fg = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- warning_diagnostic = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- warning_visible = {
|
||||||
-- guisp = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- warning_diagnostic_visible = {
|
-- warning_selected = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- bold = true,
|
||||||
-- warning_diagnostic_selected = {
|
-- italic = true,
|
||||||
-- guifg = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- },
|
||||||
-- gui = 'bold,italic',
|
-- warning_diagnostic = {
|
||||||
-- guisp = warning_diagnostic_fg,
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- sp = '<color-value-here>',
|
||||||
-- error = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- warning_diagnostic_visible = {
|
||||||
-- guisp = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- error_visible = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- warning_diagnostic_selected = {
|
||||||
-- guibg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- error_selected = {
|
-- bold = true,
|
||||||
-- guifg = '<color-value-here>',
|
-- italic = true,
|
||||||
-- guibg = '<color-value-here>',
|
-- sp = warning_diagnostic_fg,
|
||||||
-- gui = 'bold,italic',
|
-- },
|
||||||
-- guisp = '<color-value-here>',
|
-- error = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- error_diagnostic = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- },
|
||||||
-- guisp = '<color-value-here>',
|
-- error_visible = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- error_diagnostic_visible = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- error_selected = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- error_diagnostic_selected = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bold = true,
|
||||||
-- guibg = '<color-value-here>',
|
-- italic = true,
|
||||||
-- gui = 'bold,italic',
|
-- sp = '<color-value-here>',
|
||||||
-- guisp = '<color-value-here>',
|
-- },
|
||||||
-- },
|
-- error_diagnostic = {
|
||||||
-- modified = {
|
-- fg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- modified_visible = {
|
-- error_diagnostic_visible = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- modified_selected = {
|
-- error_diagnostic_selected = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- bold = true,
|
||||||
-- duplicate_selected = {
|
-- italic = true,
|
||||||
-- guifg = '<color-value-here>',
|
-- sp = '<color-value-here>',
|
||||||
-- gui = 'italic',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- modified = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- duplicate_visible = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- gui = 'italic',
|
-- modified_visible = {
|
||||||
-- guibg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- duplicate = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- modified_selected = {
|
||||||
-- gui = 'italic',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
-- separator_selected = {
|
-- duplicate_selected = {
|
||||||
-- guifg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- italic = true,
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- separator_visible = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- duplicate_visible = {
|
||||||
-- guibg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- italic = true,
|
||||||
-- separator = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- duplicate = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- indicator_selected = {
|
-- italic = true,
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- },
|
||||||
-- },
|
-- separator_selected = {
|
||||||
-- pick_selected = {
|
-- fg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- bg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- },
|
||||||
-- gui = 'bold,italic',
|
-- separator_visible = {
|
||||||
-- },
|
-- fg = '<color-value-here>',
|
||||||
-- pick_visible = {
|
-- bg = '<color-value-here>',
|
||||||
-- guifg = '<color-value-here>',
|
-- },
|
||||||
-- guibg = '<color-value-here>',
|
-- separator = {
|
||||||
-- gui = 'bold,italic',
|
-- fg = '<color-value-here>',
|
||||||
-- },
|
-- bg = '<color-value-here>',
|
||||||
-- pick = {
|
-- },
|
||||||
-- guifg = '<color-value-here>',
|
-- indicator_selected = {
|
||||||
-- guibg = '<color-value-here>',
|
-- fg = '<color-value-here>',
|
||||||
-- gui = 'bold,italic',
|
-- bg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
|
-- pick_selected = {
|
||||||
|
-- fg = '<color-value-here>',
|
||||||
|
-- bg = '<color-value-here>',
|
||||||
|
-- italic = true,
|
||||||
|
-- },
|
||||||
|
-- pick_visible = {
|
||||||
|
-- fg = '<color-value-here>',
|
||||||
|
-- bg = '<color-value-here>',
|
||||||
|
-- bold = true,
|
||||||
|
-- italic = true,
|
||||||
|
-- },
|
||||||
|
-- pick = {
|
||||||
|
-- fg = '<color-value-here>',
|
||||||
|
-- bg = '<color-value-here>',
|
||||||
|
-- bold = true,
|
||||||
|
-- italic = true,
|
||||||
|
-- },
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -281,6 +281,56 @@ function M.get()
|
||||||
TSVariable = {fg = p.text, style = styles.italic},
|
TSVariable = {fg = p.text, style = styles.italic},
|
||||||
TSVariableBuiltin = {fg = p.love},
|
TSVariableBuiltin = {fg = p.love},
|
||||||
|
|
||||||
|
-- Treesitter
|
||||||
|
['@annotation'] = { link = 'PreProc' },
|
||||||
|
['@attribute'] = { link = 'PreProc' },
|
||||||
|
['@boolean'] = { link = 'Boolean' },
|
||||||
|
['@character'] = { link = 'Character' },
|
||||||
|
['@comment'] = { link = 'Comment' },
|
||||||
|
['@conditional'] = { link = 'Conditional' },
|
||||||
|
['@constant'] = { fg = p.foam },
|
||||||
|
['@constant.builtin'] = { fg = p.love },
|
||||||
|
['@constructor'] = { fg = p.foam },
|
||||||
|
['@field'] = { fg = p.foam },
|
||||||
|
['@function'] = { fg = p.rose },
|
||||||
|
['@function.builtin'] = { fg = p.love },
|
||||||
|
['@include'] = { fg = p.pine },
|
||||||
|
['@keyword'] = { fg = p.pine },
|
||||||
|
['@keyword.operator'] = { fg = p.subtle },
|
||||||
|
['@label'] = { fg = p.foam },
|
||||||
|
['@namespace'] = { link = 'Include' },
|
||||||
|
['@number'] = { link = 'Number' },
|
||||||
|
['@operator'] = { fg = p.subtle },
|
||||||
|
['@parameter'] = { fg = p.iris, style = styles.italic },
|
||||||
|
['@property'] = { fg = p.iris, style = styles.italic },
|
||||||
|
['@punctuation.bracket'] = { fg = groups.punctuation },
|
||||||
|
['@punctuation.delimiter'] = { fg = groups.punctuation },
|
||||||
|
['@punctuation.special'] = { fg = groups.punctuation },
|
||||||
|
['@string'] = { link = 'String' },
|
||||||
|
['@string.escape'] = { fg = p.pine },
|
||||||
|
['@string.special'] = { link = '@string' },
|
||||||
|
['@symbol'] = { link = 'Identifier' },
|
||||||
|
['@tag'] = { fg = p.foam },
|
||||||
|
['@tag.attribute'] = { link = '@property' },
|
||||||
|
['@tag.delimiter'] = { fg = p.subtle },
|
||||||
|
['@text'] = { fg = p.text },
|
||||||
|
['@text.strong'] = { bold = true },
|
||||||
|
['@text.emphasis'] = { italic = true },
|
||||||
|
['@text.underline'] = { underline = true },
|
||||||
|
['@text.strike'] = { strikethrough = true },
|
||||||
|
['@text.math'] = { link = 'Special' },
|
||||||
|
['@text.environment'] = { link = 'Macro' },
|
||||||
|
['@text.environment.name'] = { link = 'Type' },
|
||||||
|
['@text.title'] = { fg = groups.headings.h1, style = 'bold' },
|
||||||
|
['@text.uri'] = { fg = groups.link },
|
||||||
|
['@text.note'] = { link = 'SpecialComment' },
|
||||||
|
['@text.warning'] = { link = 'Todo' },
|
||||||
|
['@text.danger'] = { link = 'WarningMsg' },
|
||||||
|
['@todo'] = { link = 'Todo' },
|
||||||
|
['@type'] = { link = 'Type' },
|
||||||
|
['@variable'] = { fg = p.text, style = styles.italic },
|
||||||
|
['@variable.builtin'] = { fg = p.love },
|
||||||
|
|
||||||
-- vim.lsp.buf.document_highlight()
|
-- vim.lsp.buf.document_highlight()
|
||||||
LspReferenceText = {bg = p.highlight_med},
|
LspReferenceText = {bg = p.highlight_med},
|
||||||
LspReferenceRead = {bg = p.highlight_med},
|
LspReferenceRead = {bg = p.highlight_med},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue