diff --git a/license b/LICENSE similarity index 100% rename from license rename to LICENSE diff --git a/readme.md b/README.md similarity index 96% rename from readme.md rename to README.md index 6ef48bc..db616cc 100644 --- a/readme.md +++ b/README.md @@ -15,6 +15,19 @@ Install `rose-pine/neovim` using your favourite package manager: +### [Built-in vim.pack](https://neovim.io/doc/user/pack/#_plugin-manager) + +```lua +vim.pack.add({ + { + src = "https://github.com/rose-pine/neovim", + name = "rose-pine", + }, +}) +require("rose-pine").setup() +vim.cmd("colorscheme rose-pine") +``` + ### [pam.nvim](https://github.com/mvllow/pam.nvim) ```lua diff --git a/changelog.md b/changelog.md deleted file mode 100644 index bd583ba..0000000 --- a/changelog.md +++ /dev/null @@ -1,82 +0,0 @@ -# Changelog - -## v2.0.0-next.1 - -### What's new - -- Add proper support for `StatusLineTerm` & `StatusLineTermNC`, controlled via `enable.terminal` -- Add background glow to diagnostic virtual text -- Add `extend_background_behind_borders` -- Add `styles.bold` and alternatively styling when disabled -- Add `before_highlight` hook to allow changing palette values and behaviours -- Increase contrast of search, visual selections, and more - -### Features - -**extend_background_behind_borders** - -Extend float backgrounds behind borders. Results vary depending on your border characters. - -```lua -{ - extend_background_behind_borders = true -} -``` - -**styles.transparency** - -Enable a unique experience focused around transparent terminals, avoiding large backgrounds and differentiating selections with foreground colours when possible. - -```lua -{ - styles = { - transparency = true - } -} -``` - -**before_highlight** - -```lua -{ - before_highlight = function(group, highlight, palette) - -- Disable all undercurls - if highlight.undercurl then - highlight.undercurl = false - end - - -- Change palette colour - if highlight.fg == palette.pine then - highlight.fg = palette.foam - end - end, -} -``` - -### Breaking changes - -> [!WARNING] -> Removed or renamed options should continue to work via internal migrations but backwards compatibility is not tested and may break at any time. - -```diff -- dim_nc_background = true, -+ dim_inactive_windows = true, - -- disable_background = true, -- disable_float_background = true, -+ styles.transparency = true - -- disable_italics = true, -+ styles.italic = false, - -- groups = { -- background = "...", -- comment = "...", -- punctuation = "...", -- }, -+ highlight_groups = { -+ Normal = { bg = "..." }, -+ Comment = { fg = "..." }, -+ ["@punctuation"] = { fg = "..." }, -+ } -``` diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua index fc21a2c..7e49ad6 100644 --- a/lua/rose-pine.lua +++ b/lua/rose-pine.lua @@ -223,6 +223,9 @@ local function set_highlights() Type = { fg = palette.foam }, TypeDef = { link = "Type" }, Underlined = { fg = palette.iris, underline = true }, + Added = { fg = groups.git_add }, + Changed = { fg = groups.git_change }, + Removed = { fg = groups.git_delete }, healthError = { fg = groups.error }, healthSuccess = { fg = groups.info }, @@ -462,6 +465,7 @@ local function set_highlights() -- mvllow/modes.nvim ModesCopy = { bg = palette.gold }, ModesDelete = { bg = palette.love }, + ModesFormat = { bg = palette.rose }, ModesInsert = { bg = palette.foam }, ModesReplace = { bg = palette.pine }, ModesVisual = { bg = palette.iris }, @@ -961,6 +965,8 @@ local function set_highlights() GrugFarInputPlaceholder = { link = "Comment" }, GrugFarResultsActionMessage = { fg = palette.foam }, GrugFarResultsChangeIndicator = { fg = groups.git_change }, + GrugFarResultsRemoveIndicator = { fg = groups.git_delete }, + GrugFarResultsAddIndicator = { fg = groups.git_add }, GrugFarResultsHeader = { fg = palette.pine }, GrugFarResultsLineNo = { fg = palette.iris }, GrugFarResultsLineColumn = { link = "GrugFarResultsLineNo" }, @@ -975,6 +981,8 @@ local function set_highlights() AvanteReversedSubtitle = { fg = palette.foam }, AvanteThirdTitle = { fg = palette.highlight_med, bg = palette.iris }, AvanteReversedThirdTitle = { fg = palette.iris }, + AvantePromptInput = { fg = palette.text, bg = groups.panel }, + AvantePromptInputBorder = { fg = groups.border }, -- Saghen/blink.cmp BlinkCmpDoc = { bg = palette.highlight_low }, @@ -1029,6 +1037,39 @@ local function set_highlights() Sneak = { fg = palette.base, bg = palette.love }, SneakCurrent = { link = "StatusLineTerm" }, SneakScope = { link = "IncSearch" }, + + -- sindrets/diffview.nvim + DiffviewPrimary = { fg = palette.pine }, + DiffviewSecondary = { fg = palette.foam }, + DiffviewNormal = { fg = palette.text, bg = palette.surface }, + DiffviewWinSeparator = { fg = palette.text, bg = palette.surface }, + + DiffviewFilePanelTitle = { fg = palette.foam, bold = styles.bold }, + DiffviewFilePanelCounter = { fg = palette.rose }, + DiffviewFilePanelRootPath = { fg = palette.foam, bold = styles.bold }, + DiffviewFilePanelFileName = { fg = palette.text }, + DiffviewFilePanelSelected = { fg = palette.gold }, + DiffviewFilePanelPath = { link = "Comment" }, + + DiffviewFilePanelInsertions = { fg = groups.git_add }, + DiffviewFilePanelDeletions = { fg = groups.git_delete }, + DiffviewFilePanelConflicts = { fg = groups.git_merge }, + DiffviewFolderName = { fg = palette.foam, bold = styles.bold }, + DiffviewFolderSign = { fg = palette.subtle }, + DiffviewHash = { fg = palette.rose }, + DiffviewReference = { fg = palette.foam, bold = styles.bold }, + DiffviewReflogSelector = { fg = palette.rose }, + DiffviewStatusAdded = { fg = groups.git_add }, + DiffviewStatusUntracked = { fg = groups.untracked }, + DiffviewStatusModified = { fg = groups.git_change }, + DiffviewStatusRenamed = { fg = groups.git_rename }, + DiffviewStatusCopied = { fg = groups.untracked }, + DiffviewStatusTypeChange = { fg = groups.git_change }, + DiffviewStatusUnmerged = { fg = groups.git_change }, + DiffviewStatusUnknown = { fg = groups.git_delete }, + DiffviewStatusDeleted = { fg = groups.git_delete }, + DiffviewStatusBroken = { fg = groups.git_delete }, + DiffviewStatusIgnored = { fg = groups.git_ignore }, } local transparency_highlights = { DiagnosticVirtualTextError = { fg = groups.error }, @@ -1044,6 +1085,7 @@ local function set_highlights() Normal = { fg = palette.text, bg = "NONE" }, NormalNC = { fg = palette.text, bg = config.options.dim_inactive_windows and palette._nc or "NONE" }, Pmenu = { fg = palette.subtle, bg = "NONE" }, + PmenuExtra = { fg = palette.text, bg = "NONE" }, PmenuKind = { fg = palette.foam, bg = "NONE" }, SignColumn = { fg = palette.text, bg = "NONE" }, StatusLine = { fg = palette.subtle, bg = "NONE" }, @@ -1137,6 +1179,10 @@ local function set_highlights() highlight.blend = nil highlight.blend_on = nil + if highlight._nvim_blend ~= nil then + highlight.blend = highlight._nvim_blend + end + vim.api.nvim_set_hl(0, group, highlight) end