diff --git a/README.md b/README.md index 06b72b1..3556dcc 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,49 @@ -# Vim color scheme Tone + -Modest color scheme with a reduced number of bright and clear colors. +### _Vim/Neovim Colortheme–Truecolor, Stunning and Complete_ -![Tone preview Ruby](http://stuff.imeos.org/persistent/github/vim-colors-tone/vim-colors-tone-ruby-preview.png) -*Screenshot with some Ruby sample code and the Roboto Mono Font* +Slick is a toned-down color scheme for Vim/Neovim. It's one of the most consistent and complete themes I've ever used. It supports many languages and plugins. Fork fixes minor issues and adds new stuff (i.e. EasyMotion support) compared to the initial theme. -![Tone preview JavaScript](http://stuff.imeos.org/persistent/github/vim-colors-tone/vim-colors-tone-javascript-preview.png) -*Screenshot with some JavaScript sample code and the Roboto Mono Font* +### What makes Slick special? -![Tone preview C](http://stuff.imeos.org/persistent/github/vim-colors-tone/vim-colors-tone-c-preview.png) -*Screenshot with some C sample code and the Roboto Mono Font* +Finding the right colortheme for Vim/Neovim can be quite some odyssey. There are not that many themes out there which cross all these boxes: -## Highlightings for these plugins +- **Complete UI**, all UI elements have the right color, even not so obvious stuff like modals, sign columns, 80-chars-column, cursourline and -columns +- **All major languages** are supported with granular highlighting, man, even vim-plug within VimScript! +- **Reduced color set**, it's not cramming dozens random, muddy colors, enjoy crystal clear colors paired w/matching tones +### JS, C and Ruby Gallery + + + + + + + + + +### Install +#### Install with vim-plug +Add +``` +Plug 'desmap/slick' +``` +to your .vimrc/init.vim, restart Vim/Neovim and run `:PlugInstall` in your .vimrc/init.vim file and set the colortheme with `:color slick`. + +#### Install with Vundle +Add +``` +Plugin 'desmap/slick' +``` +to your .vimrc/init.vim, restart Vim/Neovim and run `:PlugInstall` in your .vimrc/init.vim file and set the colortheme with `:color slick`. + +### Supports these plugins out of the box + +- quick-scope +- coc.vim - Ale - CtrlP +- EasyMotion - GitGutter - NERDTree - pangloss/vim-javascript @@ -22,7 +51,7 @@ Modest color scheme with a reduced number of bright and clear colors. - Startify - VIM-JavaScript (pangloss) -## Syntax highlighting adjustments for +### Turn-key ready for many languages - Apache Config - CoffeeScript @@ -30,7 +59,7 @@ Modest color scheme with a reduced number of bright and clear colors. - Git - Haml - HTML -- JavaScript (best with pangloss/vim-javascript) +- JavaScript/JSX (best with pangloss/vim-javascript) - Json - LaTeX - Markdown @@ -43,6 +72,6 @@ Modest color scheme with a reduced number of bright and clear colors. - YAML - XML -## Ancient Terminals +### Use CSApprox if you don't have truecolor -You can use a plugin like [CSApprox](http://www.vim.org/scripts/script.php?script_id=2390) to make this work smoothly in older 256 colors or even 88 colors terminals. +You can use a plugin like [CSApprox](http://www.vim.org/scripts/script.php?script_id=2390) to make this work smoothly in older 256 colors or even 88 colors terminals. diff --git a/colors/tone.vim b/colors/slick.vim similarity index 87% rename from colors/tone.vim rename to colors/slick.vim index 70f45ae..b8b18af 100644 --- a/colors/tone.vim +++ b/colors/slick.vim @@ -1,8 +1,7 @@ -" Vim color scheme Tone -" ---------------------------------------------------------------------- +" Slick +" Vim/Neovim Truecolor Colortheme " -" Repository: https://github.com/cseelus/vim-colors-tone -" Author: Chris Seelus (@cseelus) +" @desmap forked from @cseelus " " colors " -------------------------- @@ -14,13 +13,14 @@ :let _lightblack = '#3a3a58' :let _semiblack = '#222234' :let _black = '#181827' - :let _aubergine = '#c59dc5' :let _turquoise = '#1fffd2' -:let _d_turquoise = '#28a492' +:let _d_turquoise = '#007d64' :let _l_sky = '#9fd4ff' :let _sky = '#6cbeff' :let _sap = '#ebff00' +:let _poison = '#7eb72f' +:let _l_poison = '#AFFC41' set background=dark highlight clear @@ -29,8 +29,7 @@ if exists("syntax_on") syntax reset endif -set t_Co=256 -let colors_name = "tone" +let colors_name = "slick" let colorgroup = {} " Interface @@ -38,11 +37,12 @@ let colorgroup = {} let colorgroup['Normal'] = {"GUIFG": _white, "GUIBG": _black} " ------------------------ let colorgroup['Darker'] = {"GUIFG": _gray, "GUIBG": _black} -let colorgroup['ColorColumn'] = {"GUIFG": _black, "GUIBG": _aubergine} +let colorgroup['ColorColumn'] = {"GUIFG": _black, "GUIBG": _semiblack} let colorgroup['Conceal'] = {"GUIFG": _sap, "GUI": "bold"} -let colorgroup['Cursor'] = {"GUIFG": _black, "GUIBG": _turquoise} -let colorgroup['iCursor'] = {"GUIFG": _black, "GUIBG": _turquoise} -let colorgroup['CursorLine'] = {"GUIFG": _white, "GUIBG": _semiblack} +let colorgroup['Cursor'] = {"GUIFG": _black, "GUIBG": _lightblack} +let colorgroup['iCursor'] = {"GUIFG": _black, "GUIBG": _lightblack} +let colorgroup['CursorLine'] = {"GUIBG": _semiblack} +let colorgroup['CursorColumn'] = {"GUIBG": _semiblack} let colorgroup['CursorLineNr'] = {"GUIFG": _gray_dark, "GUIBG": _black} let colorgroup['Directory'] = {"GUIFG": _turquoise, "GUIBG": _black} let colorgroup['ErrorMsg'] = {"GUIFG": _black, "GUIBG": _aubergine} @@ -50,26 +50,31 @@ let colorgroup['FoldColumn'] = { "GUIBG": _black} let colorgroup['Folded'] = {"GUIFG": _white, "GUIBG": _semiblack} let colorgroup['LineNr'] = {"GUIFG": _lightblack, "GUIBG": _black} if &background == "light" - let colorgroup['LineNr'] = {"GUIFG": _gray, "GUIBG": _black} + let colorgroup['LineNr'] = {"GUIFG": _gray, "GUIBG": _black} endif -let colorgroup['MatchParen'] = {"GUIFG": _black, "GUIBG": _white} +let colorgroup['MatchParen'] = {"GUIFG": _turquoise, "GUIBG": _black} let colorgroup['ModeMsg'] = {"GUIFG": _black, "GUIBG": _turquoise} let colorgroup['Pmenu'] = {"GUIFG": _white, "GUIBG": _gray_dark} let colorgroup['PmenuSel'] = {"GUIFG": _black, "GUIBG": _turquoise} -let colorgroup['PmenuSbar'] = { "GUIBG": _black} -let colorgroup['Search'] = { "GUIBG": _gray_dark, "GUI": "underline"} +let colorgroup['PmenuSbar'] = { "GUIBG": _black} +let colorgroup['Search'] = {"GUIBG": _gray_dark, "GUI": "underline"} let colorgroup['SignColumn'] = { "GUIBG": _black} -let colorgroup['StatusLine'] = {"GUIFG": _gray, "GUIBG": _semiblack} -let colorgroup['StatusLineNC'] = {"GUIFG": _gray_dark, "GUIBG": _semiblack} +let colorgroup['StatusLine'] = {"GUIBG": _turquoise, "GUIFG": _black} +let colorgroup['StatusLineNC'] = {"GUIFG": _gray_dark, "GUIBG": _black} let colorgroup['Title'] = {"GUIFG": _turquoise, "GUI": "bold"} -let colorgroup['Todo'] = {"GUIFG": _black, "GUIBG": _sky, "GUI": "italic"} -let colorgroup['VertSplit'] = {"GUIFG": _semiblack, "GUIBG": _semiblack} +let colorgroup['Todo'] = {"GUIFG": _gray_dark, "GUIBG": _sky} +let colorgroup['VertSplit'] = {"GUIFG": _black, "GUIBG": _black} +let colorgroup['EndOfBuffer'] = {"GUIFG": _black, "GUIBG": _black} +let colorgroup['NonText'] = {"GUIFG": _lightblack, "GUIBG": _black} let colorgroup['Visual'] = {"GUIFG": _black, "GUIBG": _sap} if &background == "light" let colorgroup['Visual'] = {"GUIFG": _white, "GUIBG": _sap} endif let colorgroup['WarningMsg'] = {"GUIFG": _black, "GUIBG": _sky} +let colorgroup['EasyMotion2'] = {"GUIFG": _turquoise, "GUIBG": _d_turquoise} + + " Syntax " ---------------------------------------------------------------------- @@ -94,7 +99,7 @@ let colorgroup['PreProc'] = {"GUIFG": _d_white} let colorgroup['Type'] = {"GUIFG": _d_white} let colorgroup['Special'] = {"GUIFG": _sap} let colorgroup['Underlined'] = {"GUIFG": _turquoise, "GUI": "underline"} -let colorgroup['Error'] = {"GUIFG": _black, "GUIBG": _aubergine} +let colorgroup['Error'] = {"GUIFG": _white, "GUIBG": _aubergine} " Other highlighting groups let colorgroup['Access'] = {"GUIFG": _turquoise, "GUI": "bold"} @@ -103,11 +108,12 @@ let colorgroup['Define'] = {"GUIFG": _gray_light} let colorgroup['Function'] = {"GUIFG": _sky, "GUI": "bold"} let colorgroup['Label'] = {"GUIFG": _d_turquoise} let colorgroup['Module'] = {"GUIFG": _aubergine, "GUI": "underline"} -let colorgroup['NonText'] = {"GUIFG": _gray_dark} let colorgroup['String'] = {"GUIFG": _turquoise} let colorgroup['Structure'] = {"GUIFG": _gray} " Own highlighting groups let colorgroup['UnderlinedBold'] = {"GUIFG": _turquoise, "GUI": "underline,bold"} +let colorgroup['AccentPrimary'] = {"GUIFG": _l_poison} +let colorgroup['AccentSecondary'] = {"GUIFG": _poison} " ------------------------ hi link Boolean Number hi link Class Constant @@ -135,6 +141,31 @@ hi link Typedef Type " Plugins " ---------------------------------------------------------------------- +" quick-scope +hi link QuickScopePrimary AccentPrimary +hi link QuickScopeSecondary AccentSecondary + +" coc.vim +hi CocErrorFloat guifg=#ff0000 +hi CocWarningFloat guifg=#ffff00 + +hi CocWarningSign guifg=#ffff00 +hi CocErrorSign guifg=#ff3333 + +hi CocFloating guibg=#3a3a58 + +" sneak +hi link Sneak WarningMsg + +" EasyMotion + +hi link EasyMotionTarget StatusLine +hi link EasyMotionTarget2First StatusLine +hi link EasyMotionTarget2Second EasyMotion2 +hi link EasyMotionShade PreProc +hi link EasyMotionIncSearch String +hi link EasyMotionMoveHL StatusLine + " CtrlP hi link CtrlPMatch Character