add colorscheme and update plugins
This commit is contained in:
parent
66f4393eb8
commit
f1a9525981
38
private_dot_config/nvim/colors/darkroom.vim
Normal file
38
private_dot_config/nvim/colors/darkroom.vim
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
" Vim WriteRoom/DarkRoom/OmniWrite like colorscheme
|
||||||
|
" Maintainer: Christian Brabandt <cb@256bit.org>
|
||||||
|
" Last Change: 2012
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
hi clear
|
||||||
|
if exists("syntax_on")
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
let g:colors_name="distractfree"
|
||||||
|
|
||||||
|
hi Statement ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi Constant ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi Identifier ctermfg=Green ctermbg=Black guifg=Green guibg=Black
|
||||||
|
hi Type ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi String ctermfg=Cyan ctermbg=Black guifg=Cyan guibg=Black
|
||||||
|
hi Boolean ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi Number ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi Special ctermfg=DarkGreen ctermbg=Black guifg=darkGreen guibg=Black
|
||||||
|
hi Scrollbar ctermfg=DarkCyan ctermbg=Black guifg=DarkCyan guibg=Black
|
||||||
|
hi Cursor ctermfg=Black ctermbg=Green guifg=Black guibg=Green
|
||||||
|
hi WarningMsg ctermfg=Yellow ctermbg=Black guifg=Yellow guibg=Black
|
||||||
|
hi Directory ctermfg=Green ctermbg=DarkBlue guifg=Green guibg=DarkBlue
|
||||||
|
hi Title ctermfg=White ctermbg=DarkBlue guifg=White guibg=DarkBlue
|
||||||
|
hi Cursorline ctermfg=Black ctermbg=DarkGreen guibg=darkGreen guifg=black
|
||||||
|
hi Normal ctermfg=Green ctermbg=Black guifg=Green guibg=Black
|
||||||
|
hi PreProc ctermfg=DarkGreen ctermbg=Black guifg=DarkGreen guibg=Black
|
||||||
|
hi Comment ctermfg=darkGreen ctermbg=Black guifg=darkGreen guibg=Black
|
||||||
|
hi LineNr ctermfg=Green ctermbg=Black guifg=Green guibg=Black
|
||||||
|
hi ErrorMsg ctermfg=Red ctermbg=Black guifg=Red guibg=Black
|
||||||
|
hi Visual ctermfg=White ctermbg=DarkGray cterm=underline guifg=White guibg=DarkGray gui=underline
|
||||||
|
hi Folded ctermfg=DarkCyan ctermbg=Black cterm=underline guifg=DarkCyan guibg=Black gui=underline
|
||||||
|
|
||||||
|
" Reset by distract free
|
||||||
|
" hi NonText ctermfg=Black ctermbg=Black guifg=black guibg=Black
|
||||||
|
" hi VertSplit ctermfg=Black ctermbg=Black guifg=black guibg=Black
|
||||||
|
" hi StatusLine cterm=bold,underline ctermfg=White ctermbg=Black term=bold gui=bold,underline guifg=White guibg=Black
|
||||||
|
" hi StatusLineNC cterm=bold,underline ctermfg=Gray ctermbg=Black term=bold gui=bold,underline guifg=Gray guibg=Black
|
||||||
359
private_dot_config/nvim/colors/desert-warm-256.vim
Normal file
359
private_dot_config/nvim/colors/desert-warm-256.vim
Normal file
@ -0,0 +1,359 @@
|
|||||||
|
" Vim color file
|
||||||
|
" Original Author: Henry So, Jr. <henryso@panix.com>
|
||||||
|
" Maintainer: Rainux Luo <rainux@gmail.com>
|
||||||
|
" URL: https://github.com/rainux/vim-desert-warm-256
|
||||||
|
|
||||||
|
" It's a color scheme for Vim, based on the "desert" color scheme by Hans
|
||||||
|
" Fugal with a few small tweaks. The tweaks are try to make it looks a bit
|
||||||
|
" warm and be more friendly for my eyes. Using the code from "desert256" to
|
||||||
|
" make the gui highlight definitions also work with 88 and 256-color xterms.
|
||||||
|
"
|
||||||
|
" The original "desert" theme is available as part of the vim distribution or
|
||||||
|
" at http://hans.fugal.net/vim/colors/.
|
||||||
|
"
|
||||||
|
" The "desert256" theme is available at
|
||||||
|
" http://www.vim.org/scripts/script.php?script_id=1243.
|
||||||
|
"
|
||||||
|
" The real feature of this color scheme, with a wink to the "inkpot" theme, is
|
||||||
|
" the programmatic approximation of the gui colors to the palettes of 88- and
|
||||||
|
" 256- color xterms. The functions that do this (folded away, for
|
||||||
|
" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
|
||||||
|
" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
|
||||||
|
"
|
||||||
|
" Support rgb color names from rgb.txt file. Use a Ruby script to pre-parse
|
||||||
|
" rgb.txt then convert color names mapping to a Vim dictionary, store it in
|
||||||
|
" colors/rgb_colors file.
|
||||||
|
"
|
||||||
|
" Consider use this color scheme as infrastructure to create new color
|
||||||
|
" schemes. The benefit is your color schemes will looks nearly the same both
|
||||||
|
" in gVim and Vim running in 256- color xterms, without any additional effort.
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
if version > 580
|
||||||
|
" no guarantees for version 5.8 and below, but this makes it stop
|
||||||
|
" complaining
|
||||||
|
hi clear
|
||||||
|
if exists('syntax_on')
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
let g:colors_name='desert-warm-256'
|
||||||
|
|
||||||
|
exec 'source ' . expand('<sfile>:p:h') . '/rgb_colors'
|
||||||
|
|
||||||
|
if has('gui_running') || &t_Co == 88 || &t_Co == 256
|
||||||
|
" functions {{{
|
||||||
|
" returns an approximate grey index for the given grey level
|
||||||
|
fun <SID>grey_number(x)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:x < 23
|
||||||
|
return 0
|
||||||
|
elseif a:x < 69
|
||||||
|
return 1
|
||||||
|
elseif a:x < 103
|
||||||
|
return 2
|
||||||
|
elseif a:x < 127
|
||||||
|
return 3
|
||||||
|
elseif a:x < 150
|
||||||
|
return 4
|
||||||
|
elseif a:x < 173
|
||||||
|
return 5
|
||||||
|
elseif a:x < 196
|
||||||
|
return 6
|
||||||
|
elseif a:x < 219
|
||||||
|
return 7
|
||||||
|
elseif a:x < 243
|
||||||
|
return 8
|
||||||
|
else
|
||||||
|
return 9
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:x < 14
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
let l:n = (a:x - 8) / 10
|
||||||
|
let l:m = (a:x - 8) % 10
|
||||||
|
if l:m < 5
|
||||||
|
return l:n
|
||||||
|
else
|
||||||
|
return l:n + 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the actual grey level represented by the grey index
|
||||||
|
fun <SID>grey_level(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
elseif a:n == 1
|
||||||
|
return 46
|
||||||
|
elseif a:n == 2
|
||||||
|
return 92
|
||||||
|
elseif a:n == 3
|
||||||
|
return 115
|
||||||
|
elseif a:n == 4
|
||||||
|
return 139
|
||||||
|
elseif a:n == 5
|
||||||
|
return 162
|
||||||
|
elseif a:n == 6
|
||||||
|
return 185
|
||||||
|
elseif a:n == 7
|
||||||
|
return 208
|
||||||
|
elseif a:n == 8
|
||||||
|
return 231
|
||||||
|
else
|
||||||
|
return 255
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 8 + (a:n * 10)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the palette index for the given grey index
|
||||||
|
fun <SID>grey_color(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 16
|
||||||
|
elseif a:n == 9
|
||||||
|
return 79
|
||||||
|
else
|
||||||
|
return 79 + a:n
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 16
|
||||||
|
elseif a:n == 25
|
||||||
|
return 231
|
||||||
|
else
|
||||||
|
return 231 + a:n
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns an approximate color index for the given color level
|
||||||
|
fun <SID>rgb_number(x)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:x < 69
|
||||||
|
return 0
|
||||||
|
elseif a:x < 172
|
||||||
|
return 1
|
||||||
|
elseif a:x < 230
|
||||||
|
return 2
|
||||||
|
else
|
||||||
|
return 3
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:x < 75
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
let l:n = (a:x - 55) / 40
|
||||||
|
let l:m = (a:x - 55) % 40
|
||||||
|
if l:m < 20
|
||||||
|
return l:n
|
||||||
|
else
|
||||||
|
return l:n + 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the actual color level for the given color index
|
||||||
|
fun <SID>rgb_level(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
elseif a:n == 1
|
||||||
|
return 139
|
||||||
|
elseif a:n == 2
|
||||||
|
return 205
|
||||||
|
else
|
||||||
|
return 255
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 55 + (a:n * 40)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the palette index for the given R/G/B color indices
|
||||||
|
fun <SID>rgb_color(x, y, z)
|
||||||
|
if &t_Co == 88
|
||||||
|
return 16 + (a:x * 16) + (a:y * 4) + a:z
|
||||||
|
else
|
||||||
|
return 16 + (a:x * 36) + (a:y * 6) + a:z
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the palette index to approximate the given R/G/B color levels
|
||||||
|
fun <SID>color(r, g, b)
|
||||||
|
" get the closest grey
|
||||||
|
let l:gx = <SID>grey_number(a:r)
|
||||||
|
let l:gy = <SID>grey_number(a:g)
|
||||||
|
let l:gz = <SID>grey_number(a:b)
|
||||||
|
|
||||||
|
" get the closest color
|
||||||
|
let l:x = <SID>rgb_number(a:r)
|
||||||
|
let l:y = <SID>rgb_number(a:g)
|
||||||
|
let l:z = <SID>rgb_number(a:b)
|
||||||
|
|
||||||
|
if l:gx == l:gy && l:gy == l:gz
|
||||||
|
" there are two possibilities
|
||||||
|
let l:dgr = <SID>grey_level(l:gx) - a:r
|
||||||
|
let l:dgg = <SID>grey_level(l:gy) - a:g
|
||||||
|
let l:dgb = <SID>grey_level(l:gz) - a:b
|
||||||
|
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
|
||||||
|
let l:dr = <SID>rgb_level(l:gx) - a:r
|
||||||
|
let l:dg = <SID>rgb_level(l:gy) - a:g
|
||||||
|
let l:db = <SID>rgb_level(l:gz) - a:b
|
||||||
|
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
|
||||||
|
if l:dgrey < l:drgb
|
||||||
|
" use the grey
|
||||||
|
return <SID>grey_color(l:gx)
|
||||||
|
else
|
||||||
|
" use the color
|
||||||
|
return <SID>rgb_color(l:x, l:y, l:z)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
" only one possibility
|
||||||
|
return <SID>rgb_color(l:x, l:y, l:z)
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" returns the palette index to approximate the 'rrggbb' hex string
|
||||||
|
fun <SID>rgb(rgb)
|
||||||
|
let l:r = ('0x' . strpart(a:rgb, 0, 2)) + 0
|
||||||
|
let l:g = ('0x' . strpart(a:rgb, 2, 2)) + 0
|
||||||
|
let l:b = ('0x' . strpart(a:rgb, 4, 2)) + 0
|
||||||
|
|
||||||
|
return <SID>color(l:r, l:g, l:b)
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" sets the highlighting for the given group
|
||||||
|
" call <SID>X(group, fg, bg, attr), bg and attr are optional
|
||||||
|
fun <SID>X(group, fg, ...)
|
||||||
|
if a:fg != ''
|
||||||
|
let fg = tolower(a:fg)
|
||||||
|
let fg_hex = has_key(g:rgb_colors, fg) ? g:rgb_colors[fg] : a:fg
|
||||||
|
exec 'hi ' . a:group . ' guifg=#' . fg_hex . ' ctermfg=' . <SID>rgb(fg_hex)
|
||||||
|
endif
|
||||||
|
if a:0 > 0 && a:1 != ''
|
||||||
|
let bg = tolower(a:1)
|
||||||
|
let bg_hex = has_key(g:rgb_colors, bg) ? g:rgb_colors[bg] : bg
|
||||||
|
exec 'hi ' . a:group . ' guibg=#' . bg_hex . ' ctermbg=' . <SID>rgb(bg_hex)
|
||||||
|
endif
|
||||||
|
if a:0 > 1 && a:2 != ''
|
||||||
|
let attr = a:2
|
||||||
|
exec 'hi ' . a:group . ' gui=' . attr . ' cterm=' . attr
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
" }}}
|
||||||
|
|
||||||
|
call <SID>X('Normal', 'white', 'grey20')
|
||||||
|
|
||||||
|
" highlight groups
|
||||||
|
call <SID>X('Cursor', 'khaki', 'indianred')
|
||||||
|
"CursorIM
|
||||||
|
"Directory
|
||||||
|
"DiffAdd
|
||||||
|
"DiffChange
|
||||||
|
"DiffDelete
|
||||||
|
"DiffText
|
||||||
|
"ErrorMsg
|
||||||
|
call <SID>X('VertSplit', 'grey50', 'c2bfa5', 'none')
|
||||||
|
call <SID>X('Folded', 'orange', 'grey30')
|
||||||
|
call <SID>X('FoldColumn', 'tan', 'grey14')
|
||||||
|
call <SID>X('IncSearch', 'slategrey', 'khaki')
|
||||||
|
call <SID>X('LineNr', 'grey70', 'grey17')
|
||||||
|
call <SID>X('ModeMsg', 'goldenrod')
|
||||||
|
call <SID>X('MoreMsg', 'seagreen')
|
||||||
|
call <SID>X('NonText', 'lightblue', 'grey14', 'bold')
|
||||||
|
call <SID>X('Question', 'springgreen')
|
||||||
|
call <SID>X('Search', 'dfffdf', 'grey30')
|
||||||
|
call <SID>X('SpecialKey', 'yellowgreen')
|
||||||
|
call <SID>X('StatusLine', 'grey90', 'grey17', 'none')
|
||||||
|
call <SID>X('StatusLineNC', 'grey40', 'grey17', 'none')
|
||||||
|
call <SID>X('Title', 'indianred')
|
||||||
|
call <SID>X('Visual', 'khaki', 'olivedrab', 'none')
|
||||||
|
"VisualNOS
|
||||||
|
call <SID>X('WarningMsg', 'salmon', '', '')
|
||||||
|
"WildMenu
|
||||||
|
"Menu
|
||||||
|
call <SID>X('Pmenu', 'grey80', 'grey10')
|
||||||
|
call <SID>X('PmenuSel', 'grey80', 'grey25')
|
||||||
|
"Scrollbar
|
||||||
|
"Tooltip
|
||||||
|
call <SID>X('MatchParen', 'dfffdf', 'grey30')
|
||||||
|
|
||||||
|
" syntax highlighting groups
|
||||||
|
call <SID>X('Comment', 'skyblue')
|
||||||
|
call <SID>X('Constant', 'ffa0a0')
|
||||||
|
call <SID>X('String', 'e0a5da')
|
||||||
|
call <SID>X('Identifier', 'palegreen', '', 'none')
|
||||||
|
call <SID>X('Statement', 'ffd797', '', 'bold')
|
||||||
|
call <SID>X('PreProc', 'indianred')
|
||||||
|
call <SID>X('Type', 'e9b96e', '', 'bold')
|
||||||
|
call <SID>X('Special', 'navajowhite')
|
||||||
|
"Underlined
|
||||||
|
call <SID>X('Ignore', 'grey40')
|
||||||
|
"Error
|
||||||
|
call <SID>X('Todo', 'orangered', 'yellow2')
|
||||||
|
|
||||||
|
" delete functions {{{
|
||||||
|
delf <SID>X
|
||||||
|
delf <SID>rgb
|
||||||
|
delf <SID>color
|
||||||
|
delf <SID>rgb_color
|
||||||
|
delf <SID>rgb_level
|
||||||
|
delf <SID>rgb_number
|
||||||
|
delf <SID>grey_color
|
||||||
|
delf <SID>grey_level
|
||||||
|
delf <SID>grey_number
|
||||||
|
" }}}
|
||||||
|
else
|
||||||
|
" color terminal definitions
|
||||||
|
hi SpecialKey ctermfg=darkgreen
|
||||||
|
hi NonText cterm=bold ctermfg=darkblue
|
||||||
|
hi Directory ctermfg=darkcyan
|
||||||
|
hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1
|
||||||
|
hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green
|
||||||
|
hi Search cterm=NONE ctermfg=grey ctermbg=blue
|
||||||
|
hi MoreMsg ctermfg=darkgreen
|
||||||
|
hi ModeMsg cterm=NONE ctermfg=brown
|
||||||
|
hi LineNr ctermfg=3
|
||||||
|
hi Question ctermfg=green
|
||||||
|
hi StatusLine cterm=bold,reverse
|
||||||
|
hi StatusLineNC cterm=reverse
|
||||||
|
hi VertSplit cterm=reverse
|
||||||
|
hi Title ctermfg=5
|
||||||
|
hi Visual cterm=reverse
|
||||||
|
hi VisualNOS cterm=bold,underline
|
||||||
|
hi WarningMsg ctermfg=1
|
||||||
|
hi WildMenu ctermfg=0 ctermbg=3
|
||||||
|
hi Folded ctermfg=darkgrey ctermbg=NONE
|
||||||
|
hi FoldColumn ctermfg=darkgrey ctermbg=NONE
|
||||||
|
hi DiffAdd ctermbg=4
|
||||||
|
hi DiffChange ctermbg=5
|
||||||
|
hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
|
||||||
|
hi DiffText cterm=bold ctermbg=1
|
||||||
|
hi Comment ctermfg=darkcyan
|
||||||
|
hi Constant ctermfg=brown
|
||||||
|
hi Special ctermfg=5
|
||||||
|
hi Identifier ctermfg=6
|
||||||
|
hi Statement ctermfg=3
|
||||||
|
hi PreProc ctermfg=5
|
||||||
|
hi Type ctermfg=2
|
||||||
|
hi Underlined cterm=underline ctermfg=5
|
||||||
|
hi Ignore ctermfg=darkgrey
|
||||||
|
hi Error cterm=bold ctermfg=7 ctermbg=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
" vim: set fdl=0 fdm=marker sts=4 sw=4:
|
||||||
218
private_dot_config/nvim/colors/inkpot.vim
Normal file
218
private_dot_config/nvim/colors/inkpot.vim
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
" Vim color file
|
||||||
|
" Name: inkpot.vim
|
||||||
|
" Maintainer: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
|
||||||
|
" Homepage: http://github.com/ciaranm/inkpot/
|
||||||
|
"
|
||||||
|
" This should work in the GUI, rxvt-unicode (88 colour mode) and xterm (256
|
||||||
|
" colour mode). It won't work in 8/16 colour terminals.
|
||||||
|
"
|
||||||
|
" To use a black background, :let g:inkpot_black_background = 1
|
||||||
|
|
||||||
|
set background=dark
|
||||||
|
hi clear
|
||||||
|
if exists("syntax_on")
|
||||||
|
syntax reset
|
||||||
|
endif
|
||||||
|
|
||||||
|
let colors_name = "inkpot"
|
||||||
|
|
||||||
|
" map a urxvt cube number to an xterm-256 cube number
|
||||||
|
fun! <SID>M(a)
|
||||||
|
return strpart("0135", a:a, 1) + 0
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" map a urxvt colour to an xterm-256 colour
|
||||||
|
fun! <SID>X(a)
|
||||||
|
if &t_Co == 88
|
||||||
|
return a:a
|
||||||
|
else
|
||||||
|
if a:a == 8
|
||||||
|
return 237
|
||||||
|
elseif a:a < 16
|
||||||
|
return a:a
|
||||||
|
elseif a:a > 79
|
||||||
|
return 232 + (3 * (a:a - 80))
|
||||||
|
else
|
||||||
|
let l:b = a:a - 16
|
||||||
|
let l:x = l:b % 4
|
||||||
|
let l:y = (l:b / 4) % 4
|
||||||
|
let l:z = (l:b / 16)
|
||||||
|
return 16 + <SID>M(l:x) + (6 * <SID>M(l:y)) + (36 * <SID>M(l:z))
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
if ! exists("g:inkpot_black_background")
|
||||||
|
let g:inkpot_black_background = 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
if has("gui_running")
|
||||||
|
if ! g:inkpot_black_background
|
||||||
|
hi Normal gui=NONE guifg=#cfbfad guibg=#1e1e27
|
||||||
|
else
|
||||||
|
hi Normal gui=NONE guifg=#cfbfad guibg=#000000
|
||||||
|
endif
|
||||||
|
|
||||||
|
hi CursorLine guibg=#2e2e37
|
||||||
|
|
||||||
|
hi IncSearch gui=BOLD guifg=#303030 guibg=#cd8b60
|
||||||
|
hi Search gui=NONE guifg=#303030 guibg=#ad7b57
|
||||||
|
hi ErrorMsg gui=BOLD guifg=#ffffff guibg=#ce4e4e
|
||||||
|
hi WarningMsg gui=BOLD guifg=#ffffff guibg=#ce8e4e
|
||||||
|
hi ModeMsg gui=BOLD guifg=#7e7eae guibg=NONE
|
||||||
|
hi MoreMsg gui=BOLD guifg=#7e7eae guibg=NONE
|
||||||
|
hi Question gui=BOLD guifg=#ffcd00 guibg=NONE
|
||||||
|
|
||||||
|
hi StatusLine gui=BOLD guifg=#b9b9b9 guibg=#3e3e5e
|
||||||
|
hi User1 gui=BOLD guifg=#00ff8b guibg=#3e3e5e
|
||||||
|
hi User2 gui=BOLD guifg=#7070a0 guibg=#3e3e5e
|
||||||
|
hi StatusLineNC gui=NONE guifg=#b9b9b9 guibg=#3e3e5e
|
||||||
|
hi VertSplit gui=NONE guifg=#b9b9b9 guibg=#3e3e5e
|
||||||
|
|
||||||
|
hi WildMenu gui=BOLD guifg=#eeeeee guibg=#6e6eaf
|
||||||
|
|
||||||
|
hi MBENormal guifg=#cfbfad guibg=#2e2e3f
|
||||||
|
hi MBEChanged guifg=#eeeeee guibg=#2e2e3f
|
||||||
|
hi MBEVisibleNormal guifg=#cfcfcd guibg=#4e4e8f
|
||||||
|
hi MBEVisibleChanged guifg=#eeeeee guibg=#4e4e8f
|
||||||
|
|
||||||
|
hi DiffText gui=NONE guifg=#ffffcd guibg=#4a2a4a
|
||||||
|
hi DiffChange gui=NONE guifg=#ffffcd guibg=#306b8f
|
||||||
|
hi DiffDelete gui=NONE guifg=#ffffcd guibg=#6d3030
|
||||||
|
hi DiffAdd gui=NONE guifg=#ffffcd guibg=#306d30
|
||||||
|
|
||||||
|
hi Cursor gui=NONE guifg=#404040 guibg=#8b8bff
|
||||||
|
hi lCursor gui=NONE guifg=#404040 guibg=#8fff8b
|
||||||
|
hi CursorIM gui=NONE guifg=#404040 guibg=#8b8bff
|
||||||
|
|
||||||
|
hi Folded gui=NONE guifg=#cfcfcd guibg=#4b208f
|
||||||
|
hi FoldColumn gui=NONE guifg=#8b8bcd guibg=#2e2e2e
|
||||||
|
|
||||||
|
hi Directory gui=NONE guifg=#00ff8b guibg=NONE
|
||||||
|
hi LineNr gui=NONE guifg=#8b8bcd guibg=#2e2e2e
|
||||||
|
hi NonText gui=BOLD guifg=#8b8bcd guibg=NONE
|
||||||
|
hi SpecialKey gui=BOLD guifg=#ab60ed guibg=NONE
|
||||||
|
hi Title gui=BOLD guifg=#af4f4b guibg=NONE
|
||||||
|
hi Visual gui=NONE guifg=#eeeeee guibg=#4e4e8f
|
||||||
|
|
||||||
|
hi Comment gui=NONE guifg=#cd8b00 guibg=NONE
|
||||||
|
hi Constant gui=NONE guifg=#ffcd8b guibg=NONE
|
||||||
|
hi String gui=NONE guifg=#ffcd8b guibg=#404040
|
||||||
|
hi Error gui=NONE guifg=#ffffff guibg=#6e2e2e
|
||||||
|
hi Identifier gui=NONE guifg=#ff8bff guibg=NONE
|
||||||
|
hi Ignore gui=NONE
|
||||||
|
hi Number gui=NONE guifg=#f0ad6d guibg=NONE
|
||||||
|
hi PreProc gui=NONE guifg=#409090 guibg=NONE
|
||||||
|
hi Special gui=NONE guifg=#c080d0 guibg=NONE
|
||||||
|
hi SpecialChar gui=NONE guifg=#c080d0 guibg=#404040
|
||||||
|
hi Statement gui=NONE guifg=#808bed guibg=NONE
|
||||||
|
hi Todo gui=BOLD guifg=#303030 guibg=#d0a060
|
||||||
|
hi Type gui=NONE guifg=#ff8bff guibg=NONE
|
||||||
|
hi Underlined gui=BOLD guifg=#df9f2d guibg=NONE
|
||||||
|
hi TaglistTagName gui=BOLD guifg=#808bed guibg=NONE
|
||||||
|
|
||||||
|
hi perlSpecialMatch gui=NONE guifg=#c080d0 guibg=#404040
|
||||||
|
hi perlSpecialString gui=NONE guifg=#c080d0 guibg=#404040
|
||||||
|
|
||||||
|
hi cSpecialCharacter gui=NONE guifg=#c080d0 guibg=#404040
|
||||||
|
hi cFormat gui=NONE guifg=#c080d0 guibg=#404040
|
||||||
|
|
||||||
|
hi doxygenBrief gui=NONE guifg=#fdab60 guibg=NONE
|
||||||
|
hi doxygenParam gui=NONE guifg=#fdd090 guibg=NONE
|
||||||
|
hi doxygenPrev gui=NONE guifg=#fdd090 guibg=NONE
|
||||||
|
hi doxygenSmallSpecial gui=NONE guifg=#fdd090 guibg=NONE
|
||||||
|
hi doxygenSpecial gui=NONE guifg=#fdd090 guibg=NONE
|
||||||
|
hi doxygenComment gui=NONE guifg=#ad7b20 guibg=NONE
|
||||||
|
hi doxygenSpecial gui=NONE guifg=#fdab60 guibg=NONE
|
||||||
|
hi doxygenSpecialMultilineDesc gui=NONE guifg=#ad600b guibg=NONE
|
||||||
|
hi doxygenSpecialOnelineDesc gui=NONE guifg=#ad600b guibg=NONE
|
||||||
|
|
||||||
|
if v:version >= 700
|
||||||
|
hi Pmenu gui=NONE guifg=#eeeeee guibg=#4e4e8f
|
||||||
|
hi PmenuSel gui=BOLD guifg=#eeeeee guibg=#2e2e3f
|
||||||
|
hi PmenuSbar gui=BOLD guifg=#eeeeee guibg=#6e6eaf
|
||||||
|
hi PmenuThumb gui=BOLD guifg=#eeeeee guibg=#6e6eaf
|
||||||
|
|
||||||
|
hi SpellBad gui=undercurl guisp=#cc6666
|
||||||
|
hi SpellRare gui=undercurl guisp=#cc66cc
|
||||||
|
hi SpellLocal gui=undercurl guisp=#cccc66
|
||||||
|
hi SpellCap gui=undercurl guisp=#66cccc
|
||||||
|
|
||||||
|
hi MatchParen gui=NONE guifg=#cfbfad guibg=#4e4e8f
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if ! g:inkpot_black_background
|
||||||
|
" exec "hi Normal cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(80)
|
||||||
|
exec "hi Normal cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=black"
|
||||||
|
else
|
||||||
|
exec "hi Normal cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(16)
|
||||||
|
exec "hi Normal cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=black" . <SID>X(16)
|
||||||
|
endif
|
||||||
|
|
||||||
|
exec "hi IncSearch cterm=BOLD ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
|
||||||
|
exec "hi Search cterm=NONE ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(52)
|
||||||
|
exec "hi ErrorMsg cterm=BOLD ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(48)
|
||||||
|
exec "hi WarningMsg cterm=BOLD ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(68)
|
||||||
|
exec "hi ModeMsg cterm=BOLD ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi MoreMsg cterm=BOLD ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Question cterm=BOLD ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
|
||||||
|
|
||||||
|
exec "hi StatusLine cterm=BOLD ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi User1 cterm=BOLD ctermfg=" . <SID>X(28) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi User2 cterm=BOLD ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi StatusLineNC cterm=NONE ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi VertSplit cterm=NONE ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
|
||||||
|
|
||||||
|
exec "hi WildMenu cterm=BOLD ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
|
||||||
|
|
||||||
|
exec "hi MBENormal ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi MBEChanged ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi MBEVisibleNormal ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(82)
|
||||||
|
exec "hi MBEVisibleChanged ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
|
||||||
|
|
||||||
|
exec "hi DiffText cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(34)
|
||||||
|
exec "hi DiffChange cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(17)
|
||||||
|
exec "hi DiffDelete cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
|
||||||
|
exec "hi DiffAdd cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(20)
|
||||||
|
|
||||||
|
exec "hi Folded cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(35)
|
||||||
|
exec "hi FoldColumn cterm=NONE ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
|
||||||
|
|
||||||
|
exec "hi Directory cterm=NONE ctermfg=" . <SID>X(28) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi LineNr cterm=NONE ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
|
||||||
|
exec "hi NonText cterm=BOLD ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi SpecialKey cterm=BOLD ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Title cterm=BOLD ctermfg=" . <SID>X(48) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Visual cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(38)
|
||||||
|
|
||||||
|
exec "hi Comment cterm=NONE ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Constant cterm=NONE ctermfg=" . <SID>X(73) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi String cterm=NONE ctermfg=" . <SID>X(73) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi Error cterm=NONE ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
|
||||||
|
exec "hi Identifier cterm=NONE ctermfg=" . <SID>X(53) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Ignore cterm=NONE"
|
||||||
|
exec "hi Number cterm=NONE ctermfg=" . <SID>X(69) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi PreProc cterm=NONE ctermfg=" . <SID>X(25) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Special cterm=NONE ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi SpecialChar cterm=NONE ctermfg=" . <SID>X(55) . " ctermbg=" . <SID>X(81)
|
||||||
|
exec "hi Statement cterm=NONE ctermfg=" . <SID>X(27) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Todo cterm=BOLD ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(57)
|
||||||
|
exec "hi Type cterm=NONE ctermfg=" . <SID>X(71) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi Underlined cterm=BOLD ctermfg=" . <SID>X(77) . " ctermbg=" . "NONE"
|
||||||
|
exec "hi TaglistTagName cterm=BOLD ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
|
||||||
|
|
||||||
|
if v:version >= 700
|
||||||
|
exec "hi Pmenu cterm=NONE ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
|
||||||
|
exec "hi PmenuSel cterm=BOLD ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
|
||||||
|
exec "hi PmenuSbar cterm=BOLD ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
|
||||||
|
exec "hi PmenuThumb cterm=BOLD ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
|
||||||
|
|
||||||
|
exec "hi SpellBad cterm=NONE ctermbg=" . <SID>X(32)
|
||||||
|
exec "hi SpellRare cterm=NONE ctermbg=" . <SID>X(33)
|
||||||
|
exec "hi SpellLocal cterm=NONE ctermbg=" . <SID>X(36)
|
||||||
|
exec "hi SpellCap cterm=NONE ctermbg=" . <SID>X(21)
|
||||||
|
exec "hi MatchParen cterm=NONE ctermbg=" . <SID>X(14) . "ctermfg=" . <SID>X(25)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
" vim: set et :
|
||||||
@ -25,6 +25,7 @@ call minpac#add('tpope/vim-eunuch')
|
|||||||
command! PackUpdate call minpac#update()
|
command! PackUpdate call minpac#update()
|
||||||
command! PackClean call minpac#clean()
|
command! PackClean call minpac#clean()
|
||||||
|
|
||||||
|
colorscheme desert-warm-256
|
||||||
let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
|
let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
|
||||||
let g:netrw_dirhistmax = 0
|
let g:netrw_dirhistmax = 0
|
||||||
let g:airline#extensions#tabline#enabled = 1
|
let g:airline#extensions#tabline#enabled = 1
|
||||||
|
|||||||
@ -9,6 +9,7 @@ This is the Changelog for the vim-airline project.
|
|||||||
- [vim-lsp](https://github.com/prabirshrestha/vim-lsp) support
|
- [vim-lsp](https://github.com/prabirshrestha/vim-lsp) support
|
||||||
- [zoomwintab](https://github.com/troydm/zoomwintab.vim) support
|
- [zoomwintab](https://github.com/troydm/zoomwintab.vim) support
|
||||||
- [Vaffle](https://github.com/cocopon/vaffle.vim) support
|
- [Vaffle](https://github.com/cocopon/vaffle.vim) support
|
||||||
|
- [vim-dirvish](https://github.com/justinmk/vim-dirvish) support
|
||||||
- Improvements
|
- Improvements
|
||||||
- git branch can also be displayed using [gina.vim](https://github.com/lambdalisue/gina.vim)
|
- git branch can also be displayed using [gina.vim](https://github.com/lambdalisue/gina.vim)
|
||||||
- coc extensions can also show additional status messages
|
- coc extensions can also show additional status messages
|
||||||
|
|||||||
@ -445,7 +445,7 @@ function! airline#extensions#load()
|
|||||||
endfor
|
endfor
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if exists(':Dirvish')
|
if exists(':Dirvish') && get(g:, 'airline#extensions#dirvish#enabled', 1)
|
||||||
call airline#extensions#dirvish#init(s:ext)
|
call airline#extensions#dirvish#init(s:ext)
|
||||||
call add(s:loaded_ext, 'dirvish')
|
call add(s:loaded_ext, 'dirvish')
|
||||||
endif
|
endif
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
scriptencoding utf-8
|
scriptencoding utf-8
|
||||||
|
|
||||||
if !exists(':Dirvish')
|
if !get(g:, 'loaded_dirvish', 0)
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -22,10 +22,7 @@ function! airline#extensions#dirvish#apply(...) abort
|
|||||||
\ ? '%{airline#extensions#branch#get_head()}'
|
\ ? '%{airline#extensions#branch#get_head()}'
|
||||||
\ : ''
|
\ : ''
|
||||||
|
|
||||||
let w:airline_section_c =
|
let w:airline_section_c = '%{b:dirvish._dir}'
|
||||||
\ '%{join(split((execute("lcd"))))}'
|
|
||||||
\ . s:spc
|
|
||||||
\ . get(w:, 'airline_section_c', g:airline_section_c)
|
|
||||||
|
|
||||||
let w:airline_section_x = ''
|
let w:airline_section_x = ''
|
||||||
let w:airline_section_y = ''
|
let w:airline_section_y = ''
|
||||||
|
|||||||
@ -700,6 +700,13 @@ Denite <https://github.com/Shougo/denite.nvim>
|
|||||||
* enable/disable denite integration >
|
* enable/disable denite integration >
|
||||||
let g:airline#extensions#denite#enabled = 1
|
let g:airline#extensions#denite#enabled = 1
|
||||||
|
|
||||||
|
------------------------------------- *airline-dirvish*
|
||||||
|
vim-dirvish <https://github.com/justinmk/vim-dirvish>
|
||||||
|
|
||||||
|
* enable/disable vim-dirvish integration >
|
||||||
|
let g:airline#extensions#dirvish#enabled = 1
|
||||||
|
< default: 1
|
||||||
|
|
||||||
------------------------------------- *airline-eclim*
|
------------------------------------- *airline-eclim*
|
||||||
eclim <https://eclim.org>
|
eclim <https://eclim.org>
|
||||||
|
|
||||||
|
|||||||
@ -29,6 +29,7 @@ airline-cursormode airline.txt /*airline-cursormode*
|
|||||||
airline-customization airline.txt /*airline-customization*
|
airline-customization airline.txt /*airline-customization*
|
||||||
airline-default airline.txt /*airline-default*
|
airline-default airline.txt /*airline-default*
|
||||||
airline-denite airline.txt /*airline-denite*
|
airline-denite airline.txt /*airline-denite*
|
||||||
|
airline-dirvish airline.txt /*airline-dirvish*
|
||||||
airline-eclim airline.txt /*airline-eclim*
|
airline-eclim airline.txt /*airline-eclim*
|
||||||
airline-extensions airline.txt /*airline-extensions*
|
airline-extensions airline.txt /*airline-extensions*
|
||||||
airline-features airline.txt /*airline-features*
|
airline-features airline.txt /*airline-features*
|
||||||
|
|||||||
@ -17,6 +17,8 @@ BUG FIXES:
|
|||||||
[[GH-2895]](https://github.com/fatih/vim-go/pull/2895)
|
[[GH-2895]](https://github.com/fatih/vim-go/pull/2895)
|
||||||
* Do not show errors when adding a text property for highlighting fails.
|
* Do not show errors when adding a text property for highlighting fails.
|
||||||
[[GH-2892]](https://github.com/fatih/vim-go/pull/2892)
|
[[GH-2892]](https://github.com/fatih/vim-go/pull/2892)
|
||||||
|
* Include `errcheck` in `g:go_metalinter_enabled`'s default.
|
||||||
|
[[GH-2903]](https://github.com/fatih/vim-go/pull/2903)
|
||||||
|
|
||||||
## v1.23 - (May 16, 2020)
|
## v1.23 - (May 16, 2020)
|
||||||
|
|
||||||
|
|||||||
@ -264,23 +264,11 @@ function! go#config#MetalinterCommand() abort
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! go#config#MetalinterAutosaveEnabled() abort
|
function! go#config#MetalinterAutosaveEnabled() abort
|
||||||
let l:default_enabled = ["vet", "golint"]
|
return get(g:, "go_metalinter_autosave_enabled", ["govet", "golint"])
|
||||||
|
|
||||||
if go#config#MetalinterCommand() == "golangci-lint"
|
|
||||||
let l:default_enabled = ["govet", "golint"]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return get(g:, "go_metalinter_autosave_enabled", default_enabled)
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! go#config#MetalinterEnabled() abort
|
function! go#config#MetalinterEnabled() abort
|
||||||
let l:default_enabled = ["vet", "golint", "errcheck"]
|
return get(g:, "go_metalinter_enabled", ["vet", "golint", "errcheck"])
|
||||||
|
|
||||||
if go#config#MetalinterCommand() == "golangci-lint"
|
|
||||||
let l:default_enabled = ["govet", "golint"]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return get(g:, "go_metalinter_enabled", default_enabled)
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! go#config#GolintBin() abort
|
function! go#config#GolintBin() abort
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user