From 54c128e4771d5356190f2c6fea2bd2e613179af1 Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Mon, 23 Oct 2023 09:18:23 -0500 Subject: [PATCH 1/3] Link deprecated indent-blankline highlights --- colors/melange.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/colors/melange.lua b/colors/melange.lua index 8dfc157..c7e23f0 100644 --- a/colors/melange.lua +++ b/colors/melange.lua @@ -326,12 +326,12 @@ for name, attrs in pairs { SignifySignChange = 'GitSignsChange', SignifySignDelete = 'GitSignsDelete', - ---- :h indent-blankline-highlights (external plugin) ------ - IndentBlanklineChar = { fg = a.sel, nocombine = true }, - IndentBlanklineSpaceChar = 'IndentBlanklineChar', - IndentBlanklineSpaceCharBlankline = 'IndentBlanklineChar', + ---- :h ibl.highlights (external plugin) ------------------- IblIndent = { fg = a.sel, nocombine = true }, IblWhitespace = 'IblIndent', + IndentBlanklineChar = 'IblIndent', -- Deprecated? + IndentBlanklineSpaceChar = 'IndentBlanklineChar', + IndentBlanklineSpaceCharBlankline = 'IndentBlanklineChar', } do if type(attrs) == 'table' then vim.api.nvim_set_hl(0, name, attrs) From 9148e9aa83021368e9e775903772daf751d06f65 Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Thu, 19 Oct 2023 11:20:36 -0500 Subject: [PATCH 2/3] Highlight TermCursorNC TermCursorNC is cleared by default. --- colors/melange.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/melange.lua b/colors/melange.lua index c7e23f0..0cab2ba 100644 --- a/colors/melange.lua +++ b/colors/melange.lua @@ -31,7 +31,7 @@ for name, attrs in pairs { -- lCursor = {}, -- CursorIM = {}, -- TermCursor = {}, - -- TermCursorNC = {}, + TermCursorNC = { bg = a.sel }, ColorColumn = { bg = a.float }, CursorColumn = 'ColorColumn', From 57d01da47e0ad70d6d1c855c3231edc390800967 Mon Sep 17 00:00:00 2001 From: Sergio Alejandro Vargas Date: Thu, 19 Oct 2023 11:21:14 -0500 Subject: [PATCH 3/3] Update README doc links --- Makefile | 2 +- README.md | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 931bdd1..abbb226 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,4 @@ build: $(TERM_FILES) $(TERM_FILES): lua/melange/* nvim --headless -u NORC \ --cmd 'lua require("melange.build").build()' \ - --cmd 'q' + --cmd 'quit' diff --git a/README.md b/README.md index 38a29c7..54cb375 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ## Requirements * Neovim ≥ 0.8 -* [`termguicolors`](https://neovim.io/doc/user/options.html#'termguicolors') enabled +* `termguicolors` enabled * A terminal emulator or GUI with true color and font variants support (italics, bold, etc). @@ -45,7 +45,8 @@ Additionally, [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitt can be used to install tree-sitter parsers. ## Usage -Enable `termguicolors` and load the `colorscheme`. +Enable [`termguicolors`](https://neovim.io/doc/user/options.html#'termguicolors') +and load the [`colorscheme`](https://neovim.io/doc/user/syntax.html#%3Acolorscheme). In your `init.lua`: ```lua @@ -59,8 +60,8 @@ set termguicolors colorscheme melange ``` -To enable the light variant, set the `background` (or let your terminal do it for you) -before setting the colorscheme. +To enable the light variant, set the [`background`](https://neovim.io/doc/user/options.html#'background') +(or let your terminal do it for you) before setting the colorscheme. ## Design @@ -73,4 +74,4 @@ and it's been inspired by many colorschemes, in particular Ayu and Gruvbox. melange dark screenshot melange light screenshot -(The font in the screenshots is [IBM/plex](https://github.com/IBM/plex) Mono.) +