Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Dev #70

Merged
merged 3 commits into from
Jan 27, 2024
Merged

Dev #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c128e
Link deprecated indent-blankline highlights
savq Oct 23, 2023
9148e9a
Highlight TermCursorNC
savq Oct 19, 2023
57d01da
Update README doc links
savq Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).


Expand All @@ -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
Expand All @@ -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
Expand All @@ -73,4 +74,4 @@ and it's been inspired by many colorschemes, in particular Ayu and Gruvbox.
<img width="1326" alt="melange dark screenshot" src="https://user-images.githubusercontent.com/30883030/212500086-a6709213-c82a-4eca-8f3f-67fdc5c26f23.png">
<img width="1326" alt="melange light screenshot" src="https://user-images.githubusercontent.com/30883030/212500082-b67699c7-09dd-42f5-ac7e-ee71ca41c5c6.png">

(The font in the screenshots is [IBM/plex](https://github.com/IBM/plex) Mono.)
<!-- The font in the screenshots is [IBM Plex Mono](https://github.com/IBM/plex) -->
10 changes: 5 additions & 5 deletions colors/melange.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ for name, attrs in pairs {
-- lCursor = {},
-- CursorIM = {},
-- TermCursor = {},
-- TermCursorNC = {},
TermCursorNC = { bg = a.sel },

ColorColumn = { bg = a.float },
CursorColumn = 'ColorColumn',
Expand Down Expand Up @@ -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)
Expand Down