From f1a9525981a4934c0ac40798c5ed97b5dfd6419d Mon Sep 17 00:00:00 2001 From: Julien Rabier Date: Mon, 1 Jun 2020 00:33:15 +0200 Subject: [PATCH] add colorscheme and update plugins --- private_dot_config/nvim/colors/darkroom.vim | 38 ++ .../nvim/colors/desert-warm-256.vim | 359 ++++++++++++++++++ private_dot_config/nvim/colors/inkpot.vim | 218 +++++++++++ private_dot_config/nvim/init.vim.tmpl | 1 + .../minpac/start/vim-airline/CHANGELOG.md | 1 + .../autoload/airline/extensions.vim | 2 +- .../autoload/airline/extensions/dirvish.vim | 7 +- .../minpac/start/vim-airline/doc/airline.txt | 7 + .../pack/minpac/start/vim-airline/doc/tags | 1 + .../pack/minpac/start/vim-go/CHANGELOG.md | 2 + .../start/vim-go/autoload/go/config.vim | 16 +- 11 files changed, 632 insertions(+), 20 deletions(-) create mode 100644 private_dot_config/nvim/colors/darkroom.vim create mode 100644 private_dot_config/nvim/colors/desert-warm-256.vim create mode 100644 private_dot_config/nvim/colors/inkpot.vim diff --git a/private_dot_config/nvim/colors/darkroom.vim b/private_dot_config/nvim/colors/darkroom.vim new file mode 100644 index 0000000..37c4e62 --- /dev/null +++ b/private_dot_config/nvim/colors/darkroom.vim @@ -0,0 +1,38 @@ +" Vim WriteRoom/DarkRoom/OmniWrite like colorscheme +" Maintainer: Christian Brabandt +" 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 diff --git a/private_dot_config/nvim/colors/desert-warm-256.vim b/private_dot_config/nvim/colors/desert-warm-256.vim new file mode 100644 index 0000000..9bc930a --- /dev/null +++ b/private_dot_config/nvim/colors/desert-warm-256.vim @@ -0,0 +1,359 @@ +" Vim color file +" Original Author: Henry So, Jr. +" Maintainer: Rainux Luo +" 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(':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 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 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 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 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 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 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 color(r, g, b) + " get the closest grey + let l:gx = grey_number(a:r) + let l:gy = grey_number(a:g) + let l:gz = grey_number(a:b) + + " get the closest color + let l:x = rgb_number(a:r) + let l:y = rgb_number(a:g) + let l:z = rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " there are two possibilities + let l:dgr = grey_level(l:gx) - a:r + let l:dgg = grey_level(l:gy) - a:g + let l:dgb = grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = rgb_level(l:gx) - a:r + let l:dg = rgb_level(l:gy) - a:g + let l:db = 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 grey_color(l:gx) + else + " use the color + return rgb_color(l:x, l:y, l:z) + endif + else + " only one possibility + return rgb_color(l:x, l:y, l:z) + endif + endfun + + " returns the palette index to approximate the 'rrggbb' hex string + fun 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 color(l:r, l:g, l:b) + endfun + + " sets the highlighting for the given group + " call X(group, fg, bg, attr), bg and attr are optional + fun 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=' . 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=' . 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 X('Normal', 'white', 'grey20') + + " highlight groups + call X('Cursor', 'khaki', 'indianred') + "CursorIM + "Directory + "DiffAdd + "DiffChange + "DiffDelete + "DiffText + "ErrorMsg + call X('VertSplit', 'grey50', 'c2bfa5', 'none') + call X('Folded', 'orange', 'grey30') + call X('FoldColumn', 'tan', 'grey14') + call X('IncSearch', 'slategrey', 'khaki') + call X('LineNr', 'grey70', 'grey17') + call X('ModeMsg', 'goldenrod') + call X('MoreMsg', 'seagreen') + call X('NonText', 'lightblue', 'grey14', 'bold') + call X('Question', 'springgreen') + call X('Search', 'dfffdf', 'grey30') + call X('SpecialKey', 'yellowgreen') + call X('StatusLine', 'grey90', 'grey17', 'none') + call X('StatusLineNC', 'grey40', 'grey17', 'none') + call X('Title', 'indianred') + call X('Visual', 'khaki', 'olivedrab', 'none') + "VisualNOS + call X('WarningMsg', 'salmon', '', '') + "WildMenu + "Menu + call X('Pmenu', 'grey80', 'grey10') + call X('PmenuSel', 'grey80', 'grey25') + "Scrollbar + "Tooltip + call X('MatchParen', 'dfffdf', 'grey30') + + " syntax highlighting groups + call X('Comment', 'skyblue') + call X('Constant', 'ffa0a0') + call X('String', 'e0a5da') + call X('Identifier', 'palegreen', '', 'none') + call X('Statement', 'ffd797', '', 'bold') + call X('PreProc', 'indianred') + call X('Type', 'e9b96e', '', 'bold') + call X('Special', 'navajowhite') + "Underlined + call X('Ignore', 'grey40') + "Error + call X('Todo', 'orangered', 'yellow2') + + " delete functions {{{ + delf X + delf rgb + delf color + delf rgb_color + delf rgb_level + delf rgb_number + delf grey_color + delf grey_level + delf 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: diff --git a/private_dot_config/nvim/colors/inkpot.vim b/private_dot_config/nvim/colors/inkpot.vim new file mode 100644 index 0000000..1ee5749 --- /dev/null +++ b/private_dot_config/nvim/colors/inkpot.vim @@ -0,0 +1,218 @@ +" Vim color file +" Name: inkpot.vim +" Maintainer: Ciaran McCreesh +" 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! M(a) + return strpart("0135", a:a, 1) + 0 +endfun + +" map a urxvt colour to an xterm-256 colour +fun! 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 + M(l:x) + (6 * M(l:y)) + (36 * 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=" . X(79) . " ctermbg=" . X(80) + exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=black" + else + exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(16) + exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=black" . X(16) + endif + + exec "hi IncSearch cterm=BOLD ctermfg=" . X(80) . " ctermbg=" . X(73) + exec "hi Search cterm=NONE ctermfg=" . X(80) . " ctermbg=" . X(52) + exec "hi ErrorMsg cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(48) + exec "hi WarningMsg cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(68) + exec "hi ModeMsg cterm=BOLD ctermfg=" . X(38) . " ctermbg=" . "NONE" + exec "hi MoreMsg cterm=BOLD ctermfg=" . X(38) . " ctermbg=" . "NONE" + exec "hi Question cterm=BOLD ctermfg=" . X(52) . " ctermbg=" . "NONE" + + exec "hi StatusLine cterm=BOLD ctermfg=" . X(85) . " ctermbg=" . X(81) + exec "hi User1 cterm=BOLD ctermfg=" . X(28) . " ctermbg=" . X(81) + exec "hi User2 cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . X(81) + exec "hi StatusLineNC cterm=NONE ctermfg=" . X(84) . " ctermbg=" . X(81) + exec "hi VertSplit cterm=NONE ctermfg=" . X(84) . " ctermbg=" . X(81) + + exec "hi WildMenu cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(38) + + exec "hi MBENormal ctermfg=" . X(85) . " ctermbg=" . X(81) + exec "hi MBEChanged ctermfg=" . X(87) . " ctermbg=" . X(81) + exec "hi MBEVisibleNormal ctermfg=" . X(85) . " ctermbg=" . X(82) + exec "hi MBEVisibleChanged ctermfg=" . X(87) . " ctermbg=" . X(82) + + exec "hi DiffText cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(34) + exec "hi DiffChange cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(17) + exec "hi DiffDelete cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(32) + exec "hi DiffAdd cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(20) + + exec "hi Folded cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(35) + exec "hi FoldColumn cterm=NONE ctermfg=" . X(39) . " ctermbg=" . X(80) + + exec "hi Directory cterm=NONE ctermfg=" . X(28) . " ctermbg=" . "NONE" + exec "hi LineNr cterm=NONE ctermfg=" . X(39) . " ctermbg=" . X(80) + exec "hi NonText cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . "NONE" + exec "hi SpecialKey cterm=BOLD ctermfg=" . X(55) . " ctermbg=" . "NONE" + exec "hi Title cterm=BOLD ctermfg=" . X(48) . " ctermbg=" . "NONE" + exec "hi Visual cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(38) + + exec "hi Comment cterm=NONE ctermfg=" . X(52) . " ctermbg=" . "NONE" + exec "hi Constant cterm=NONE ctermfg=" . X(73) . " ctermbg=" . "NONE" + exec "hi String cterm=NONE ctermfg=" . X(73) . " ctermbg=" . X(81) + exec "hi Error cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(32) + exec "hi Identifier cterm=NONE ctermfg=" . X(53) . " ctermbg=" . "NONE" + exec "hi Ignore cterm=NONE" + exec "hi Number cterm=NONE ctermfg=" . X(69) . " ctermbg=" . "NONE" + exec "hi PreProc cterm=NONE ctermfg=" . X(25) . " ctermbg=" . "NONE" + exec "hi Special cterm=NONE ctermfg=" . X(55) . " ctermbg=" . "NONE" + exec "hi SpecialChar cterm=NONE ctermfg=" . X(55) . " ctermbg=" . X(81) + exec "hi Statement cterm=NONE ctermfg=" . X(27) . " ctermbg=" . "NONE" + exec "hi Todo cterm=BOLD ctermfg=" . X(16) . " ctermbg=" . X(57) + exec "hi Type cterm=NONE ctermfg=" . X(71) . " ctermbg=" . "NONE" + exec "hi Underlined cterm=BOLD ctermfg=" . X(77) . " ctermbg=" . "NONE" + exec "hi TaglistTagName cterm=BOLD ctermfg=" . X(39) . " ctermbg=" . "NONE" + + if v:version >= 700 + exec "hi Pmenu cterm=NONE ctermfg=" . X(87) . " ctermbg=" . X(82) + exec "hi PmenuSel cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(38) + exec "hi PmenuSbar cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(39) + exec "hi PmenuThumb cterm=BOLD ctermfg=" . X(87) . " ctermbg=" . X(39) + + exec "hi SpellBad cterm=NONE ctermbg=" . X(32) + exec "hi SpellRare cterm=NONE ctermbg=" . X(33) + exec "hi SpellLocal cterm=NONE ctermbg=" . X(36) + exec "hi SpellCap cterm=NONE ctermbg=" . X(21) + exec "hi MatchParen cterm=NONE ctermbg=" . X(14) . "ctermfg=" . X(25) + endif +endif + +" vim: set et : diff --git a/private_dot_config/nvim/init.vim.tmpl b/private_dot_config/nvim/init.vim.tmpl index afc74c4..2d67523 100644 --- a/private_dot_config/nvim/init.vim.tmpl +++ b/private_dot_config/nvim/init.vim.tmpl @@ -25,6 +25,7 @@ call minpac#add('tpope/vim-eunuch') command! PackUpdate call minpac#update() command! PackClean call minpac#clean() +colorscheme desert-warm-256 let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"] let g:netrw_dirhistmax = 0 let g:airline#extensions#tabline#enabled = 1 diff --git a/private_dot_config/nvim/pack/minpac/start/vim-airline/CHANGELOG.md b/private_dot_config/nvim/pack/minpac/start/vim-airline/CHANGELOG.md index 89cc137..edf9e61 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-airline/CHANGELOG.md +++ b/private_dot_config/nvim/pack/minpac/start/vim-airline/CHANGELOG.md @@ -9,6 +9,7 @@ This is the Changelog for the vim-airline project. - [vim-lsp](https://github.com/prabirshrestha/vim-lsp) support - [zoomwintab](https://github.com/troydm/zoomwintab.vim) support - [Vaffle](https://github.com/cocopon/vaffle.vim) support + - [vim-dirvish](https://github.com/justinmk/vim-dirvish) support - Improvements - git branch can also be displayed using [gina.vim](https://github.com/lambdalisue/gina.vim) - coc extensions can also show additional status messages diff --git a/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions.vim b/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions.vim index 60716b3..594c835 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions.vim +++ b/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions.vim @@ -445,7 +445,7 @@ function! airline#extensions#load() endfor endif - if exists(':Dirvish') + if exists(':Dirvish') && get(g:, 'airline#extensions#dirvish#enabled', 1) call airline#extensions#dirvish#init(s:ext) call add(s:loaded_ext, 'dirvish') endif diff --git a/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions/dirvish.vim b/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions/dirvish.vim index 5ccab97..4e03fed 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions/dirvish.vim +++ b/private_dot_config/nvim/pack/minpac/start/vim-airline/autoload/airline/extensions/dirvish.vim @@ -4,7 +4,7 @@ scriptencoding utf-8 -if !exists(':Dirvish') +if !get(g:, 'loaded_dirvish', 0) finish endif @@ -22,10 +22,7 @@ function! airline#extensions#dirvish#apply(...) abort \ ? '%{airline#extensions#branch#get_head()}' \ : '' - let w:airline_section_c = - \ '%{join(split((execute("lcd"))))}' - \ . s:spc - \ . get(w:, 'airline_section_c', g:airline_section_c) + let w:airline_section_c = '%{b:dirvish._dir}' let w:airline_section_x = '' let w:airline_section_y = '' diff --git a/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/airline.txt b/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/airline.txt index ab60082..c63be9b 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/airline.txt +++ b/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/airline.txt @@ -700,6 +700,13 @@ Denite * enable/disable denite integration > let g:airline#extensions#denite#enabled = 1 +------------------------------------- *airline-dirvish* +vim-dirvish + +* enable/disable vim-dirvish integration > + let g:airline#extensions#dirvish#enabled = 1 +< default: 1 + ------------------------------------- *airline-eclim* eclim diff --git a/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/tags b/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/tags index 522fd44..2d2e258 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/tags +++ b/private_dot_config/nvim/pack/minpac/start/vim-airline/doc/tags @@ -29,6 +29,7 @@ airline-cursormode airline.txt /*airline-cursormode* airline-customization airline.txt /*airline-customization* airline-default airline.txt /*airline-default* airline-denite airline.txt /*airline-denite* +airline-dirvish airline.txt /*airline-dirvish* airline-eclim airline.txt /*airline-eclim* airline-extensions airline.txt /*airline-extensions* airline-features airline.txt /*airline-features* diff --git a/private_dot_config/nvim/pack/minpac/start/vim-go/CHANGELOG.md b/private_dot_config/nvim/pack/minpac/start/vim-go/CHANGELOG.md index 8ff58cd..c254d98 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-go/CHANGELOG.md +++ b/private_dot_config/nvim/pack/minpac/start/vim-go/CHANGELOG.md @@ -17,6 +17,8 @@ BUG FIXES: [[GH-2895]](https://github.com/fatih/vim-go/pull/2895) * Do not show errors when adding a text property for highlighting fails. [[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) diff --git a/private_dot_config/nvim/pack/minpac/start/vim-go/autoload/go/config.vim b/private_dot_config/nvim/pack/minpac/start/vim-go/autoload/go/config.vim index 8a58080..b10304d 100644 --- a/private_dot_config/nvim/pack/minpac/start/vim-go/autoload/go/config.vim +++ b/private_dot_config/nvim/pack/minpac/start/vim-go/autoload/go/config.vim @@ -264,23 +264,11 @@ function! go#config#MetalinterCommand() abort endfunction function! go#config#MetalinterAutosaveEnabled() abort - let l:default_enabled = ["vet", "golint"] - - if go#config#MetalinterCommand() == "golangci-lint" - let l:default_enabled = ["govet", "golint"] - endif - - return get(g:, "go_metalinter_autosave_enabled", default_enabled) + return get(g:, "go_metalinter_autosave_enabled", ["govet", "golint"]) endfunction function! go#config#MetalinterEnabled() abort - let l:default_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) + return get(g:, "go_metalinter_enabled", ["vet", "golint", "errcheck"]) endfunction function! go#config#GolintBin() abort