diff options
| -rw-r--r-- | .config/nvim/autoload/pathogen.vim | 38 | ||||
| -rw-r--r-- | .config/nvim/colors/gruvbox.vim | 50 |
2 files changed, 61 insertions, 27 deletions
diff --git a/.config/nvim/autoload/pathogen.vim b/.config/nvim/autoload/pathogen.vim index a13ae08f..59a75c14 100644 --- a/.config/nvim/autoload/pathogen.vim +++ b/.config/nvim/autoload/pathogen.vim @@ -1,6 +1,6 @@ " pathogen.vim - path option manipulation " Maintainer: Tim Pope <http://tpo.pe/> -" Version: 2.3 +" Version: 2.4 " Install in ~/.vim/autoload (or ~\vimfiles\autoload). " @@ -90,27 +90,30 @@ function! pathogen#cycle_filetype() abort endfunction " Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_disabled. +" basename or full name is included in the list g:pathogen_blacklist or the +" comma delimited environment variable $VIMBLACKLIST. function! pathogen#is_disabled(path) abort if a:path =~# '\~$' return 1 endif let sep = pathogen#slash() - let blacklist = map( + let blacklist = \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST), - \ 'substitute(v:val, "[\\/]$", "", "")') + \ pathogen#split($VIMBLACKLIST) + if !empty(blacklist) + call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') + endif return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction "}}}1 +endfunction " Prepend the given directory to the runtime path and append its corresponding " after directory. Curly braces are expanded with pathogen#expand(). function! pathogen#surround(path) abort let sep = pathogen#slash() let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':p:?[\\/]\=$??') + let path = fnamemodify(a:path, ':s?[\\/]\=$??') let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') + let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') call filter(rtp, 'index(before + after, v:val) == -1') let &rtp = pathogen#join(before, rtp, after) return &rtp @@ -128,7 +131,7 @@ function! pathogen#interpose(name) abort let list = [] for dir in pathogen#split(&rtp) if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] + let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] else let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') endif @@ -171,7 +174,8 @@ endfunction " alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields " ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard " and globbed. Actual globs are preserved. -function! pathogen#expand(pattern) abort +function! pathogen#expand(pattern, ...) abort + let after = a:0 ? a:1 : '' if a:pattern =~# '{[^{}]\+}' let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) let found = map(split(pat, ',', 1), 'pre.v:val.post') @@ -179,14 +183,16 @@ function! pathogen#expand(pattern) abort for pattern in found call extend(results, pathogen#expand(pattern)) endfor - return results elseif a:pattern =~# '{}' let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)') let post = a:pattern[strlen(pat) : -1] - return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') + let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') else - return [a:pattern] + let results = [a:pattern] endif + let vf = pathogen#slash() . 'vimfiles' + call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') + return filter(results, '!empty(v:val)') endfunction " \ on Windows unless shellslash is set, / everywhere else. @@ -202,12 +208,12 @@ endfunction function! pathogen#glob(pattern) abort let files = split(glob(a:pattern),"\n") return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction "}}}1 +endfunction " Like pathogen#glob(), only limit the results to directories. function! pathogen#glob_directories(pattern) abort return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction "}}}1 +endfunction " Remove duplicates from a list. function! pathogen#uniq(list) abort @@ -239,7 +245,7 @@ function! pathogen#fnameescape(string) abort endfunction " Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 +function! pathogen#runtime_findfile(file,count) abort let rtp = pathogen#join(1,pathogen#split(&rtp)) let file = findfile(a:file,rtp,a:count) if file ==# '' diff --git a/.config/nvim/colors/gruvbox.vim b/.config/nvim/colors/gruvbox.vim index d4f5b8b4..be984f70 100644 --- a/.config/nvim/colors/gruvbox.vim +++ b/.config/nvim/colors/gruvbox.vim @@ -99,7 +99,7 @@ let s:gb.gray_245 = ['#928374', 245] " 146-131-116 let s:gb.gray_244 = ['#928374', 244] " 146-131-116 let s:gb.light0_hard = ['#f9f5d7', 230] " 249-245-215 -let s:gb.light0 = ['#fdf4c1', 229] " 253-244-193 +let s:gb.light0 = ['#fbf1c7', 229] " 253-244-193 let s:gb.light0_soft = ['#f2e5bc', 228] " 242-229-188 let s:gb.light1 = ['#ebdbb2', 223] " 235-219-178 let s:gb.light2 = ['#d5c4a1', 250] " 213-196-161 @@ -278,6 +278,10 @@ if exists('g:gruvbox_hls_cursor') endif let s:number_column = s:bg4 +if exists('g:gruvbox_number_column') + let s:number_column = get(s:gb, g:gruvbox_number_column) +endif + let s:sign_column = s:bg1 if exists('g:gitgutter_override_sign_column_highlight') && @@ -391,10 +395,15 @@ endfunction " memoize common hi groups call s:HL('GruvboxFg0', s:fg0) call s:HL('GruvboxFg1', s:fg1) +call s:HL('GruvboxFg2', s:fg2) call s:HL('GruvboxFg3', s:fg3) call s:HL('GruvboxFg4', s:fg4) call s:HL('GruvboxGray', s:gray) +call s:HL('GruvboxBg0', s:bg0) +call s:HL('GruvboxBg1', s:bg1) call s:HL('GruvboxBg2', s:bg2) +call s:HL('GruvboxBg3', s:bg3) +call s:HL('GruvboxBg4', s:bg4) call s:HL('GruvboxRed', s:red) call s:HL('GruvboxRedBold', s:red, s:none, s:bold) @@ -403,9 +412,9 @@ call s:HL('GruvboxGreenBold', s:green, s:none, s:bold) call s:HL('GruvboxYellow', s:yellow) call s:HL('GruvboxYellowBold', s:yellow, s:none, s:bold) call s:HL('GruvboxBlue', s:blue) -" call s:HL('GruvboxBlueBold', s:blue, s:none, s:bold) +call s:HL('GruvboxBlueBold', s:blue, s:none, s:bold) call s:HL('GruvboxPurple', s:purple) -" call s:HL('GruvboxPurpleBold', s:purple, s:none, s:bold) +call s:HL('GruvboxPurpleBold', s:purple, s:none, s:bold) call s:HL('GruvboxAqua', s:aqua) call s:HL('GruvboxAquaBold', s:aqua, s:none, s:bold) call s:HL('GruvboxOrange', s:orange) @@ -469,8 +478,8 @@ hi! link SpecialKey GruvboxBg2 call s:HL('Visual', s:none, s:bg3, s:invert_selection) hi! link VisualNOS Visual -call s:HL('Search', s:bg0, s:yellow) -call s:HL('IncSearch', s:bg0, s:hls_cursor) +call s:HL('Search', s:yellow, s:bg0, s:inverse) +call s:HL('IncSearch', s:hls_cursor, s:bg0, s:inverse) call s:HL('Underlined', s:blue, s:none, s:underline) @@ -490,7 +499,7 @@ hi! link Directory GruvboxGreenBold hi! link Title GruvboxGreenBold " Error messages on the command line -call s:HL('ErrorMsg', s:vim_bg, s:red, s:bold) +call s:HL('ErrorMsg', s:bg0, s:red, s:bold) " More prompt: -- More -- hi! link MoreMsg GruvboxYellowBold " Current mode message: -- INSERT -- @@ -742,12 +751,8 @@ hi! link SyntasticWarningSign GruvboxYellowSign " }}} " Signature: {{{ - +hi! link SignatureMarkText GruvboxBlueSign hi! link SignatureMarkerText GruvboxPurpleSign -hi! link SignatureMarkText GruvboxBlueSign - -let g:SignatureMarkerTextHL='"SignatureMarkerText"' -let g:SignatureMarkTextHL='"SignatureMarkText"' " }}} " ShowMarks: {{{ @@ -794,6 +799,14 @@ let g:vimshell_escape_colors = [ \ ] " }}} +" BufTabLine: {{{ + +call s:HL('BufTabLineCurrent', s:bg0, s:fg4) +call s:HL('BufTabLineActive', s:fg4, s:bg2) +call s:HL('BufTabLineHidden', s:bg4, s:bg1) +call s:HL('BufTabLineFill', s:bg0, s:bg0) + +" }}} " Filetype specific ----------------------------------------------------------- " Diff: {{{ @@ -1026,6 +1039,21 @@ hi! link javascriptDocParamType GruvboxFg4 hi! link javascriptDocNamedParamType GruvboxFg4 " }}} +" TypeScript: {{{ + +hi! link typeScriptReserved GruvboxAqua +hi! link typeScriptLabel GruvboxAqua +hi! link typeScriptIdentifier GruvboxOrange +hi! link typeScriptBraces GruvboxFg1 +hi! link typeScriptEndColons GruvboxFg1 +hi! link typeScriptDOMObjects GruvboxFg1 +hi! link typeScriptAjaxMethods GruvboxFg1 +hi! link typeScriptLogicSymbols GruvboxFg1 +hi! link typeScriptDocSeeTag Comment +hi! link typeScriptDocParam Comment +hi! link typeScriptDocTags vimCommentTitle + +" }}} " CoffeeScript: {{{ hi! link coffeeExtendedOp GruvboxFg3 |