mirror of
https://github.com/rose-pine/neovim.git
synced 2025-10-15 12:38:53 +02:00
updated colours, formatting
This commit is contained in:
parent
821d91699f
commit
9f8166f90a
10 changed files with 806 additions and 833 deletions
|
|
@ -4,23 +4,15 @@ return {
|
||||||
normal = {
|
normal = {
|
||||||
a = {bg = p.surface, fg = p.rose, gui = 'bold'},
|
a = {bg = p.surface, fg = p.rose, gui = 'bold'},
|
||||||
b = {bg = p.surface, fg = p.text},
|
b = {bg = p.surface, fg = p.text},
|
||||||
c = { bg = p.surface, fg = p.subtle, gui = 'italic' },
|
c = {bg = p.surface, fg = p.subtle, gui = 'italic'}
|
||||||
},
|
|
||||||
insert = {
|
|
||||||
a = { bg = p.surface, fg = p.foam, gui = 'bold' },
|
|
||||||
},
|
|
||||||
visual = {
|
|
||||||
a = { bg = p.surface, fg = p.iris, gui = 'bold' },
|
|
||||||
},
|
|
||||||
replace = {
|
|
||||||
a = { bg = p.surface, fg = p.pine, gui = 'bold' },
|
|
||||||
},
|
|
||||||
command = {
|
|
||||||
a = { bg = p.surface, fg = p.love, gui = 'bold' },
|
|
||||||
},
|
},
|
||||||
|
insert = {a = {bg = p.surface, fg = p.foam, gui = 'bold'}},
|
||||||
|
visual = {a = {bg = p.surface, fg = p.iris, gui = 'bold'}},
|
||||||
|
replace = {a = {bg = p.surface, fg = p.pine, gui = 'bold'}},
|
||||||
|
command = {a = {bg = p.surface, fg = p.love, gui = 'bold'}},
|
||||||
inactive = {
|
inactive = {
|
||||||
a = {bg = p.base, fg = p.subtle, gui = 'bold'},
|
a = {bg = p.base, fg = p.subtle, gui = 'bold'},
|
||||||
b = {bg = p.base, fg = p.subtle},
|
b = {bg = p.base, fg = p.subtle},
|
||||||
c = { bg = p.base, fg = p.subtle, gui = 'italic' },
|
c = {bg = p.base, fg = p.subtle, gui = 'italic'}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,31 +4,31 @@ return {
|
||||||
normal = {
|
normal = {
|
||||||
a = {bg = p.rose, fg = p.base, gui = 'bold'},
|
a = {bg = p.rose, fg = p.base, gui = 'bold'},
|
||||||
b = {bg = p.overlay, fg = p.rose},
|
b = {bg = p.overlay, fg = p.rose},
|
||||||
c = { bg = p.base, fg = p.text },
|
c = {bg = p.base, fg = p.text}
|
||||||
},
|
},
|
||||||
insert = {
|
insert = {
|
||||||
a = {bg = p.foam, fg = p.base, gui = 'bold'},
|
a = {bg = p.foam, fg = p.base, gui = 'bold'},
|
||||||
b = {bg = p.overlay, fg = p.foam},
|
b = {bg = p.overlay, fg = p.foam},
|
||||||
c = { bg = p.base, fg = p.text },
|
c = {bg = p.base, fg = p.text}
|
||||||
},
|
},
|
||||||
visual = {
|
visual = {
|
||||||
a = {bg = p.iris, fg = p.base, gui = 'bold'},
|
a = {bg = p.iris, fg = p.base, gui = 'bold'},
|
||||||
b = {bg = p.overlay, fg = p.iris},
|
b = {bg = p.overlay, fg = p.iris},
|
||||||
c = { bg = p.base, fg = p.text },
|
c = {bg = p.base, fg = p.text}
|
||||||
},
|
},
|
||||||
replace = {
|
replace = {
|
||||||
a = {bg = p.pine, fg = p.base, gui = 'bold'},
|
a = {bg = p.pine, fg = p.base, gui = 'bold'},
|
||||||
b = {bg = p.overlay, fg = p.pine},
|
b = {bg = p.overlay, fg = p.pine},
|
||||||
c = { bg = p.base, fg = p.text },
|
c = {bg = p.base, fg = p.text}
|
||||||
},
|
},
|
||||||
command = {
|
command = {
|
||||||
a = { bg = p.love, fg = p.base, gui = 'bold' },
|
a = {bg = p.cold, fg = p.base, gui = 'bold'},
|
||||||
b = {bg = p.overlay, fg = p.love},
|
b = {bg = p.overlay, fg = p.love},
|
||||||
c = { bg = p.base, fg = p.text },
|
c = {bg = p.base, fg = p.text}
|
||||||
},
|
},
|
||||||
inactive = {
|
inactive = {
|
||||||
a = {bg = p.base, fg = p.muted, gui = 'bold'},
|
a = {bg = p.base, fg = p.muted, gui = 'bold'},
|
||||||
b = {bg = p.base, fg = p.muted},
|
b = {bg = p.base, fg = p.muted},
|
||||||
c = { bg = p.base, fg = p.muted },
|
c = {bg = p.base, fg = p.muted}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,7 @@ local util = require('rose-pine.util')
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
function M.colorscheme()
|
function M.colorscheme()
|
||||||
if vim.g.colors_name then
|
if vim.g.colors_name then vim.cmd('hi clear') end
|
||||||
vim.cmd('hi clear')
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
vim.g.colors_name = 'rose-pine'
|
vim.g.colors_name = 'rose-pine'
|
||||||
|
|
@ -13,9 +11,7 @@ function M.colorscheme()
|
||||||
local theme = require('rose-pine.theme').get()
|
local theme = require('rose-pine.theme').get()
|
||||||
|
|
||||||
-- Set theme highlights
|
-- Set theme highlights
|
||||||
for group, color in pairs(theme) do
|
for group, color in pairs(theme) do util.highlight(group, color) end
|
||||||
util.highlight(group, color)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,15 @@ local palette = {
|
||||||
muted = '#6e6a86',
|
muted = '#6e6a86',
|
||||||
subtle = '#908caa',
|
subtle = '#908caa',
|
||||||
text = '#e0def4',
|
text = '#e0def4',
|
||||||
love = '#eb6f92',
|
love = '#e89b9f',
|
||||||
gold = '#f69957',
|
gold = '#f69957',
|
||||||
rose = '#ebbcba',
|
-- rose = '#ebbcba',
|
||||||
|
rose = '#ff79b1',
|
||||||
calm = '#23ff87',
|
calm = '#23ff87',
|
||||||
pine = '#cd51d5',
|
pine = '#cd51d5',
|
||||||
foam = '#9ccfd8',
|
foam = '#9ccfd8',
|
||||||
iris = '#c4a7e7',
|
iris = '#c4a7e7',
|
||||||
|
cold = '#967de5',
|
||||||
highlight_low = '#21202e',
|
highlight_low = '#21202e',
|
||||||
highlight_med = '#403d52',
|
highlight_med = '#403d52',
|
||||||
highlight_high = '#524f67',
|
highlight_high = '#524f67',
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
--- @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 {
|
||||||
|
|
@ -40,15 +39,8 @@ return {
|
||||||
-- guifg = '<color-value-here>',
|
-- guifg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- guibg = '<color-value-here>',
|
||||||
-- },
|
-- },
|
||||||
buffer_visible = {
|
buffer_visible = {guifg = p.subtle, guibg = p.base},
|
||||||
guifg = p.subtle,
|
buffer_selected = {guifg = p.text, guibg = p.surface, gui = 'bold,italic'}
|
||||||
guibg = p.base,
|
|
||||||
},
|
|
||||||
buffer_selected = {
|
|
||||||
guifg = p.text,
|
|
||||||
guibg = p.surface,
|
|
||||||
gui = 'bold,italic',
|
|
||||||
},
|
|
||||||
-- diagnostic = {
|
-- diagnostic = {
|
||||||
-- guifg = '<color-value-here>',
|
-- guifg = '<color-value-here>',
|
||||||
-- guibg = '<color-value-here>',
|
-- guibg = '<color-value-here>',
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
---
|
---
|
||||||
--- @usage
|
--- @usage
|
||||||
--- local highlights = require('rose-pine.plugins.galaxyline')
|
--- local highlights = require('rose-pine.plugins.galaxyline')
|
||||||
|
|
||||||
local p = require('rose-pine.palette')
|
local p = require('rose-pine.palette')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
@ -16,5 +15,5 @@ return {
|
||||||
orange = p.muted,
|
orange = p.muted,
|
||||||
magenta = p.iris,
|
magenta = p.iris,
|
||||||
blue = p.foam,
|
blue = p.foam,
|
||||||
red = p.love,
|
red = p.love
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
--- @usage
|
--- @usage
|
||||||
--- local highlights = require('rose-pine.plugins.markid')
|
--- local highlights = require('rose-pine.plugins.markid')
|
||||||
--- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } })
|
--- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } })
|
||||||
|
|
||||||
local p = require('rose-pine.palette')
|
local p = require('rose-pine.palette')
|
||||||
|
|
||||||
return {p.foam, p.rose, p.iris}
|
return {p.foam, p.rose, p.iris}
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,11 @@
|
||||||
--- @usage
|
--- @usage
|
||||||
--- local highlights = require('rose-pine.plugins.toggleterm')
|
--- local highlights = require('rose-pine.plugins.toggleterm')
|
||||||
--- require('toggleterm').setup({ highlights = highlights })
|
--- require('toggleterm').setup({ highlights = highlights })
|
||||||
|
|
||||||
return {
|
return {
|
||||||
Normal = {link = 'Normal'},
|
Normal = {link = 'Normal'},
|
||||||
NormalFloat = {link = 'Normal'},
|
NormalFloat = {link = 'Normal'},
|
||||||
FloatBorder = {link = 'FloatBorder'},
|
FloatBorder = {link = 'FloatBorder'},
|
||||||
SignColumn = {link = 'SignColumn'},
|
SignColumn = {link = 'SignColumn'},
|
||||||
StatusLine = {link = 'StatusLine'},
|
StatusLine = {link = 'StatusLine'},
|
||||||
StatusLineNC = { link = 'StatusLineNC' },
|
StatusLineNC = {link = 'StatusLineNC'}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,15 +35,15 @@ function M.get()
|
||||||
h3 = 'rose',
|
h3 = 'rose',
|
||||||
h4 = 'gold',
|
h4 = 'gold',
|
||||||
h5 = 'pine',
|
h5 = 'pine',
|
||||||
h6 = 'foam',
|
h6 = 'foam'
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
local styles = {
|
local styles = {
|
||||||
italic = 'italic',
|
italic = 'italic',
|
||||||
vert_split = p.none,
|
vert_split = p.none,
|
||||||
background = groups.background,
|
background = groups.background,
|
||||||
float_background = groups.panel,
|
float_background = groups.panel
|
||||||
}
|
}
|
||||||
styles.nc_background = styles.background
|
styles.nc_background = styles.background
|
||||||
|
|
||||||
|
|
@ -493,7 +493,7 @@ function M.get()
|
||||||
DashboardShortcut = {fg = p.love},
|
DashboardShortcut = {fg = p.love},
|
||||||
DashboardHeader = {fg = p.pine},
|
DashboardHeader = {fg = p.pine},
|
||||||
DashboardCenter = {fg = p.gold},
|
DashboardCenter = {fg = p.gold},
|
||||||
DashboardFooter = { fg = p.iris },
|
DashboardFooter = {fg = p.iris}
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.g.terminal_color_0 = p.overlay -- black
|
vim.g.terminal_color_0 = p.overlay -- black
|
||||||
|
|
|
||||||
|
|
@ -15,15 +15,13 @@ local function rgb(color)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function parse_color(color)
|
local function parse_color(color)
|
||||||
if color == nil then
|
if color == nil then return print('invalid color') end
|
||||||
return print('invalid color')
|
|
||||||
end
|
|
||||||
|
|
||||||
color = color:lower()
|
color = color:lower()
|
||||||
|
|
||||||
if not color:find('#') and color ~= 'none' then
|
if not color:find('#') and color ~= 'none' then
|
||||||
color = require('rose-pine.palette')[color]
|
color = require('rose-pine.palette')[color] or
|
||||||
or vim.api.nvim_get_color_by_name(color)
|
vim.api.nvim_get_color_by_name(color)
|
||||||
end
|
end
|
||||||
|
|
||||||
return color
|
return color
|
||||||
|
|
@ -41,12 +39,8 @@ util.blend = function(fg, bg, alpha)
|
||||||
return math.floor(math.min(math.max(0, ret), 255) + 0.5)
|
return math.floor(math.min(math.max(0, ret), 255) + 0.5)
|
||||||
end
|
end
|
||||||
|
|
||||||
return string.format(
|
return string.format('#%02X%02X%02X', blend_channel(1), blend_channel(2),
|
||||||
'#%02X%02X%02X',
|
blend_channel(3))
|
||||||
blend_channel(1),
|
|
||||||
blend_channel(2),
|
|
||||||
blend_channel(3)
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param group string
|
---@param group string
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue