Fix several mistakes; update readme

This commit is contained in:
Iron_E 2020-06-21 22:38:18 -04:00
parent 5f89cc8da0
commit 03e2382a30
No known key found for this signature in database
GPG Key ID: B0B37DE7EDC2335F
3 changed files with 110 additions and 97 deletions

View File

@ -4,13 +4,15 @@
This template's focus is on compatability with [semantic highlighting](https://medium.com/@evnbr/coding-in-color-3a6db2743a1e). This template's focus is on compatability with [semantic highlighting](https://medium.com/@evnbr/coding-in-color-3a6db2743a1e).
It provides a large supply of defaults for plugins and programming languages as a result of defining a smaller set of "categorical" highlights (you can read more about this at Neovim's `group-name` help page).
# Prerequisites # Prerequisites
1. Neovim 0.5+ 1. Neovim 0.5+
# Usage # Usage
Usage is simple. This repository should be cloned with `git clone https://github.com/Iron-E/nvim-highlite`, and then: This repository should be cloned with `git clone https://github.com/Iron-E/nvim-highlite`, and then:
1. Rename `lua/highlite/` to `lua/<name of your colorscheme>/`. 1. Rename `lua/highlite/` to `lua/<name of your colorscheme>/`.
2. Follow the directions in [lua/`<name of your colorscheme>`/init.lua](lua/highlite/init.lua). 2. Follow the directions in [lua/`<name of your colorscheme>`/init.lua](lua/highlite/init.lua).

View File

@ -1,15 +1,14 @@
--[[ NOTHING IN THIS FILE NEEDS TO BE EDITED BY THE USER. ]] --[[ NOTHING IN THIS FILE NEEDS TO BE EDITED BY THE USER. ]]
return function(name, Normal, highlights, terminal_ansi_colors)
-- Clear the highlighting. -- Clear the highlighting.
vim.cmd('hi clear') vim.cmd('hi clear')
vim.o.background = 'dark'
vim.g.indent_guides_auto_colors = 0
-- If the syntax has been enabled, reset it. -- If the syntax has been enabled, reset it.
if vim.fn.exists('syntax_on') then vim.cmd('syntax reset') end if vim.fn.exists('syntax_on') then vim.cmd('syntax reset') end
-- Set the name of the current colorscheme.
vim.g.colors_name = string.lower(name)
-- Determine which set of colors to use. -- Determine which set of colors to use.
local use_hex_and_256 = string.find(vim.fn.expand('$TERM'), '256') local use_hex_and_256 = string.find(vim.fn.expand('$TERM'), '256')
or vim.g.t_Co >= 256 or vim.g.t_Co >= 256
@ -62,7 +61,7 @@ return function(name, Normal, highlights, terminal_ansi_colors)
end end
-- This function appends `selected_attributes` to the end of the `highlight_cmd`. -- This function appends `selected_attributes` to the end of the `highlight_cmd`.
function append_style(selected_attributes) local function append_style(selected_attributes)
highlight_cmd[#highlight_cmd + 1] = ' cterm=' .. selected_attributes highlight_cmd[#highlight_cmd + 1] = ' cterm=' .. selected_attributes
-- If we're using hex populate the gui* attr args. -- If we're using hex populate the gui* attr args.
@ -89,6 +88,10 @@ return function(name, Normal, highlights, terminal_ansi_colors)
vim.cmd(table.concat(highlight_cmd)) vim.cmd(table.concat(highlight_cmd))
end --}}} ‡ end --}}} ‡
return function(name, Normal, highlights, terminal_ansi_colors)
-- Set the name of the current colorscheme.
vim.g.colors_name = string.lower(name)
-- Highlight the baseline. -- Highlight the baseline.
highlight('Normal', Normal) highlight('Normal', Normal)
@ -101,7 +104,4 @@ return function(name, Normal, highlights, terminal_ansi_colors)
for index, color in ipairs(terminal_ansi_colors) do for index, color in ipairs(terminal_ansi_colors) do
vim.g['terminal_color_' .. index] = color[HEX] vim.g['terminal_color_' .. index] = color[HEX]
end end
vim.o.background = 'dark'
vim.g.indent_guides_auto_colors = 0
end end

View File

@ -65,6 +65,8 @@ local name = 'highlite'
If your colors are defined correctly, the resulting colorscheme is guaranteed If your colors are defined correctly, the resulting colorscheme is guaranteed
to work in GVim (Windows/Linux), MacVim (MacOS), and any properly set up terminal emulator. to work in GVim (Windows/Linux), MacVim (MacOS), and any properly set up terminal emulator.
NOTE: |Replace-mode| will probably be useful here.
]] ]]
local black = {'#202020', 0, 'black'} local black = {'#202020', 0, 'black'}
@ -164,6 +166,14 @@ local purple_dark = {'#c700ff', 38, 'darkmagenta'}
remove any if you want a working colorscheme. Most of them are described under remove any if you want a working colorscheme. Most of them are described under
:help highlight-default, the others are taken from :help group-name. Both help sections :help highlight-default, the others are taken from :help group-name. Both help sections
are good reads, by the way. are good reads, by the way.
NOTE: |Replace-mode| will probably be useful here.
NOTE: /As long as you do not remove any highlight groups or colors/, you can safely
ignore any highlight groups that are `link`ed others.
For example, programming languages almost exclusively link to the 1st
and 2nd sections, so as long as you define everything there you will automatically
be defining the rest of the highlights.
]] ]]
--[[ DO NOT EDIT THESE. You can use them instead of string literals. ]] --[[ DO NOT EDIT THESE. You can use them instead of string literals. ]]
@ -222,7 +232,7 @@ local highlights = {
SpecialChar = {link='Character' }, SpecialChar = {link='Character' },
SpecialKey = {link='Character' }, SpecialKey = {link='Character' },
Tag = {link='Underlined' }, Tag = {link='Underlined' },
Delimiter = {bg=NONE, fg=gray, style=NONE }, Delimiter = {link='Normal' },
SpecialComment = {bg=NONE, fg=gray, style={'bold', 'nocombine'}}, SpecialComment = {bg=NONE, fg=gray, style={'bold', 'nocombine'}},
Debug = {link='WarningMsg' }, Debug = {link='WarningMsg' },
@ -393,6 +403,7 @@ local highlights = {
mkdCodeDelimiter = {link='Delimiter' }, mkdCodeDelimiter = {link='Delimiter' },
mkdItalic = {bg=NONE, fg=green, style='italic'}, mkdItalic = {bg=NONE, fg=green, style='italic'},
mkdListItem = {link='Special' }, mkdListItem = {link='Special' },
mkdNonListItemBlock = {bg=NONE, fg=gray, style=NONE },
texMathZoneY = {link='String' }, texMathZoneY = {link='String' },
--[[ 4.3.20. Python ]] --[[ 4.3.20. Python ]]