diff --git a/.gitignore b/.gitignore index 7cfcea1..07afded 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vimrc.local .netrwhist *~ *.swp +.DS_Store diff --git a/.gitmodules b/.gitmodules index a8727c5..05505f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,18 @@ [submodule "pack/local/start/tlib_vim"] path = pack/local/start/tlib_vim url = git@github.com:tomtom/tlib_vim.git +[submodule "pack/local/opt/vim-tomorrow-theme"] + path = pack/local/opt/vim-tomorrow-theme + url = git@github.com:chriskempson/vim-tomorrow-theme.git +[submodule "pack/local/opt/freya"] + path = pack/local/opt/freya + url = git@github.com:jie-mei/freya.git +[submodule "pack/local/opt/inkpot"] + path = pack/local/opt/inkpot + url = git@github.com:ciaranm/inkpot.git +[submodule "pack/local/opt/moria"] + path = pack/local/opt/moria + url = git@github.com:vim-scripts/moria.git +[submodule "pack/local/opt/vim-obsidian"] + path = pack/local/opt/vim-obsidian + url = git@github.com:abra/vim-obsidian.git diff --git a/gvimrc b/gvimrc index dd4a177..893bbf9 100644 --- a/gvimrc +++ b/gvimrc @@ -19,10 +19,9 @@ set mousefocus set errorbells set visualbell set showtabline=2 +set number set guicursor=a:block-blinkon0 set showtabline=2 -set guitablabel=%!GuiTabLabel() -set guitabtooltip=%!GuiTabToolTip() set background=dark set cpoptions=+$ @@ -35,6 +34,26 @@ endif colorscheme Tomorrow-Night-Eighties +" Start NERDTree and leave the cursor in it. +autocmd VimEnter * NERDTree | wincmd p +" Start NERDTree when Vim is started without file arguments. +autocmd StdinReadPre * let s:std_in=1 +autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif +" If a file is specified, move the cursor to its window. +autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif +" Start NERDTree when Vim starts with a directory argument. +autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') | + \ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif +" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree. +autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 | + \ let buf=bufnr() | buffer# | execute "normal! \w" | execute 'buffer'.buf | endif +" Open the existing NERDTree on each new tab. +autocmd BufWinEnter * silent NERDTreeMirror +" Exit Vim if NERDTree is the only window left. +autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | + \ quit | endif + + " Line/block move up/down if (has('mac') || has('macunix')) " set clipboard=unnamedplus @@ -75,14 +94,11 @@ endif autocmd BufWritePost ~/.gvimrc so ~/.gvimrc autocmd BufWritePost ~/.vim/gvimrc so ~/.vim/gvimrc -let g:terminal_ansi_colors = ['#073642', '#dc322f', \ - '#859900', '#b58900', \ - '#268bd2', '#d33682', \ - '#2aa198', '#eee8d5', \ - '#002b36', '#cb4b16', \ - '#93a1a1', '#839496', \ - '#657b83', '#6c71c4', \ - '#586e75', '#fdf6e3'] +let g:terminal_ansi_colors = ['#073642', '#dc322f', + \ '#859900', '#b58900', '#268bd2', '#d33682', + \ '#2aa198', '#eee8d5', '#002b36', '#cb4b16', + \ '#93a1a1', '#839496', '#657b83', '#6c71c4', + \ '#586e75', '#fdf6e3'] " User customizations are held in file ~/.vim/gvimrc.local if filereadable($HOME."/.vim/gvimrc.local") diff --git a/pack/local/opt/Tomorrow-Night-Eighties/colors/Tomorrow-Night-Eighties.vim b/pack/local/opt/Tomorrow-Night-Eighties/colors/Tomorrow-Night-Eighties.vim deleted file mode 100644 index 6199cba..0000000 --- a/pack/local/opt/Tomorrow-Night-Eighties/colors/Tomorrow-Night-Eighties.vim +++ /dev/null @@ -1,472 +0,0 @@ -" Tomorrow Night Eighties - Full Colour and 256 Colour -" http://chriskempson.com -" -" Hex colour conversion functions borrowed from the theme "Desert256"" - -" Default GUI Colours -let s:foreground = "cccccc" -let s:background = "2d2d2d" -let s:selection = "515151" -let s:line = "393939" -let s:comment = "999999" -let s:red = "f2777a" -let s:orange = "f99157" -let s:yellow = "ffcc66" -let s:green = "99cc99" -let s:aqua = "66cccc" -let s:blue = "6699cc" -let s:purple = "cc99cc" -let s:window = "4d5057" - -hi clear -syntax reset - -let g:colors_name = "Tomorrow-Night-Eighties" - -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - " 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_colour(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 colour index for the given colour 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 colour level for the given colour 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 colour indices - fun rgb_colour(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 colour levels - fun colour(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 colour - 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_colour(l:gx) - else - " Use the colour - return rgb_colour(l:x, l:y, l:z) - endif - else - " Only one possibility - return rgb_colour(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 colour(l:r, l:g, l:b) - endfun - - " Sets the highlighting for the given group - fun X(group, fg, bg, attr) - if a:fg != "" - exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) - endif - if a:bg != "" - exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif - endfun - - " Vim Highlighting - call X("Normal", s:foreground, s:background, "") - call X("LineNr", s:selection, "", "") - call X("NonText", s:selection, "", "") - call X("SpecialKey", s:selection, "", "") - call X("Search", s:background, s:yellow, "") - call X("TabLine", s:window, s:foreground, "reverse") - call X("TabLineFill", s:window, s:foreground, "reverse") - call X("StatusLine", s:window, s:yellow, "reverse") - call X("StatusLineNC", s:window, s:foreground, "reverse") - call X("VertSplit", s:window, s:window, "none") - call X("Visual", "", s:selection, "") - call X("Directory", s:blue, "", "") - call X("ModeMsg", s:green, "", "") - call X("MoreMsg", s:green, "", "") - call X("Question", s:green, "", "") - call X("WarningMsg", s:red, "", "") - call X("MatchParen", "", s:selection, "") - call X("Folded", s:comment, s:background, "") - call X("FoldColumn", "", s:background, "") - if version >= 700 - call X("CursorLine", "", s:line, "none") - call X("CursorColumn", "", s:line, "none") - call X("PMenu", s:foreground, s:selection, "none") - call X("PMenuSel", s:foreground, s:selection, "reverse") - call X("SignColumn", "", s:background, "none") - end - if version >= 703 - call X("ColorColumn", "", s:line, "none") - end - - " Standard Highlighting - call X("Comment", s:comment, "", "") - call X("Todo", s:comment, s:background, "") - call X("Title", s:comment, "", "") - call X("Identifier", s:red, "", "none") - call X("Statement", s:foreground, "", "") - call X("Conditional", s:foreground, "", "") - call X("Repeat", s:foreground, "", "") - call X("Structure", s:purple, "", "") - call X("Function", s:blue, "", "") - call X("Constant", s:orange, "", "") - call X("Keyword", s:orange, "", "") - call X("String", s:green, "", "") - call X("Special", s:foreground, "", "") - call X("PreProc", s:purple, "", "") - call X("Operator", s:aqua, "", "none") - call X("Type", s:blue, "", "none") - call X("Define", s:purple, "", "none") - call X("Include", s:blue, "", "") - "call X("Ignore", "666666", "", "") - - " Vim Highlighting - call X("vimCommand", s:red, "", "none") - - " C Highlighting - call X("cType", s:yellow, "", "") - call X("cStorageClass", s:purple, "", "") - call X("cConditional", s:purple, "", "") - call X("cRepeat", s:purple, "", "") - - " PHP Highlighting - call X("phpVarSelector", s:red, "", "") - call X("phpKeyword", s:purple, "", "") - call X("phpRepeat", s:purple, "", "") - call X("phpConditional", s:purple, "", "") - call X("phpStatement", s:purple, "", "") - call X("phpMemberSelector", s:foreground, "", "") - - " Ruby Highlighting - call X("rubySymbol", s:green, "", "") - call X("rubyConstant", s:yellow, "", "") - call X("rubyAccess", s:yellow, "", "") - call X("rubyAttribute", s:blue, "", "") - call X("rubyInclude", s:blue, "", "") - call X("rubyLocalVariableOrMethod", s:orange, "", "") - call X("rubyCurlyBlock", s:orange, "", "") - call X("rubyStringDelimiter", s:green, "", "") - call X("rubyInterpolationDelimiter", s:orange, "", "") - call X("rubyConditional", s:purple, "", "") - call X("rubyRepeat", s:purple, "", "") - call X("rubyControl", s:purple, "", "") - call X("rubyException", s:purple, "", "") - - " Python Highlighting - call X("pythonInclude", s:purple, "", "") - call X("pythonStatement", s:purple, "", "") - call X("pythonConditional", s:purple, "", "") - call X("pythonRepeat", s:purple, "", "") - call X("pythonException", s:purple, "", "") - call X("pythonFunction", s:blue, "", "") - call X("pythonPreCondit", s:purple, "", "") - call X("pythonRepeat", s:aqua, "", "") - call X("pythonExClass", s:orange, "", "") - - " JavaScript Highlighting - call X("javaScriptBraces", s:foreground, "", "") - call X("javaScriptFunction", s:purple, "", "") - call X("javaScriptConditional", s:purple, "", "") - call X("javaScriptRepeat", s:purple, "", "") - call X("javaScriptNumber", s:orange, "", "") - call X("javaScriptMember", s:orange, "", "") - call X("javascriptNull", s:orange, "", "") - call X("javascriptGlobal", s:blue, "", "") - call X("javascriptStatement", s:red, "", "") - - " CoffeeScript Highlighting - call X("coffeeRepeat", s:purple, "", "") - call X("coffeeConditional", s:purple, "", "") - call X("coffeeKeyword", s:purple, "", "") - call X("coffeeObject", s:yellow, "", "") - - " HTML Highlighting - call X("htmlTag", s:red, "", "") - call X("htmlTagName", s:red, "", "") - call X("htmlArg", s:red, "", "") - call X("htmlScriptTag", s:red, "", "") - - " Diff Highlighting - call X("diffAdd", "", "4c4e39", "") - call X("diffDelete", s:background, s:red, "") - call X("diffChange", "", "2B5B77", "") - call X("diffText", s:line, s:blue, "") - - " ShowMarks Highlighting - call X("ShowMarksHLl", s:orange, s:background, "none") - call X("ShowMarksHLo", s:purple, s:background, "none") - call X("ShowMarksHLu", s:yellow, s:background, "none") - call X("ShowMarksHLm", s:aqua, s:background, "none") - - " Lua Highlighting - call X("luaStatement", s:purple, "", "") - call X("luaRepeat", s:purple, "", "") - call X("luaCondStart", s:purple, "", "") - call X("luaCondElseif", s:purple, "", "") - call X("luaCond", s:purple, "", "") - call X("luaCondEnd", s:purple, "", "") - - " Cucumber Highlighting - call X("cucumberGiven", s:blue, "", "") - call X("cucumberGivenAnd", s:blue, "", "") - - " Go Highlighting - call X("goDirective", s:purple, "", "") - call X("goDeclaration", s:purple, "", "") - call X("goStatement", s:purple, "", "") - call X("goConditional", s:purple, "", "") - call X("goConstants", s:orange, "", "") - call X("goTodo", s:yellow, "", "") - call X("goDeclType", s:blue, "", "") - call X("goBuiltins", s:purple, "", "") - - " Clojure "highlighting - call X("clojureConstant", s:orange, "", "") - call X("clojureBoolean", s:orange, "", "") - call X("clojureCharacter", s:orange, "", "") - call X("clojureKeyword", s:green, "", "") - call X("clojureNumber", s:orange, "", "") - call X("clojureString", s:green, "", "") - call X("clojureRegexp", s:green, "", "") - call X("clojureParen", s:aqua, "", "") - call X("clojureVariable", s:yellow, "", "") - call X("clojureCond", s:blue, "", "") - call X("clojureDefine", s:purple, "", "") - call X("clojureException", s:red, "", "") - call X("clojureFunc", s:blue, "", "") - call X("clojureMacro", s:blue, "", "") - call X("clojureRepeat", s:blue, "", "") - call X("clojureSpecial", s:purple, "", "") - call X("clojureQuote", s:blue, "", "") - call X("clojureUnquote", s:blue, "", "") - call X("clojureMeta", s:blue, "", "") - call X("clojureDeref", s:blue, "", "") - call X("clojureAnonArg", s:blue, "", "") - call X("clojureRepeat", s:blue, "", "") - call X("clojureDispatch", s:blue, "", "") - - " Scala "highlighting - call X("scalaKeyword", s:purple, "", "") - call X("scalaKeywordModifier", s:purple, "", "") - call X("scalaOperator", s:blue, "", "") - call X("scalaPackage", s:red, "", "") - call X("scalaFqn", s:foreground, "", "") - call X("scalaFqnSet", s:foreground, "", "") - call X("scalaImport", s:purple, "", "") - call X("scalaBoolean", s:orange, "", "") - call X("scalaDef", s:purple, "", "") - call X("scalaVal", s:purple, "", "") - call X("scalaVar", s:aqua, "", "") - call X("scalaClass", s:purple, "", "") - call X("scalaObject", s:purple, "", "") - call X("scalaTrait", s:purple, "", "") - call X("scalaDefName", s:blue, "", "") - call X("scalaValName", s:foreground, "", "") - call X("scalaVarName", s:foreground, "", "") - call X("scalaClassName", s:foreground, "", "") - call X("scalaType", s:yellow, "", "") - call X("scalaTypeSpecializer", s:yellow, "", "") - call X("scalaAnnotation", s:orange, "", "") - call X("scalaNumber", s:orange, "", "") - call X("scalaDefSpecializer", s:yellow, "", "") - call X("scalaClassSpecializer", s:yellow, "", "") - call X("scalaBackTick", s:green, "", "") - call X("scalaRoot", s:foreground, "", "") - call X("scalaMethodCall", s:blue, "", "") - call X("scalaCaseType", s:yellow, "", "") - call X("scalaLineComment", s:comment, "", "") - call X("scalaComment", s:comment, "", "") - call X("scalaDocComment", s:comment, "", "") - call X("scalaDocTags", s:comment, "", "") - call X("scalaEmptyString", s:green, "", "") - call X("scalaMultiLineString", s:green, "", "") - call X("scalaUnicode", s:orange, "", "") - call X("scalaString", s:green, "", "") - call X("scalaStringEscape", s:green, "", "") - call X("scalaSymbol", s:orange, "", "") - call X("scalaChar", s:orange, "", "") - call X("scalaXml", s:green, "", "") - call X("scalaConstructorSpecializer", s:yellow, "", "") - call X("scalaBackTick", s:blue, "", "") - - " Git - call X("diffAdded", s:green, "", "") - call X("diffRemoved", s:red, "", "") - call X("gitcommitSummary", "", "", "bold") - - " Delete Functions - delf X - delf rgb - delf colour - delf rgb_colour - delf rgb_level - delf rgb_number - delf grey_colour - delf grey_level - delf grey_number -endif - -set background=dark diff --git a/pack/local/opt/camo/colors/camo.vim b/pack/local/opt/camo/colors/camo.vim deleted file mode 100644 index 059af42..0000000 --- a/pack/local/opt/camo/colors/camo.vim +++ /dev/null @@ -1,76 +0,0 @@ -" Vim color file -" Maintainer: Tim Aldrich -" Last Change: 19 January 2002 - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="camo" -hi Normal guifg=bisque guibg=grey15 -hi Cursor guifg=snow guibg=bisque3 -hi CursorIM guifg=OliveDrab4 guibg=bisque -hi Directory guifg=OliveDrab4 guibg=grey15 -hi DiffAdd guifg=DarkOliveGreen1 guibg=grey15 -hi DiffChange guifg=PaleGreen guibg=grey15 -hi DiffDelete guifg=red guibg=grey15 -hi DiffText guifg=grey15 guibg=red -hi ErrorMsg guifg=snow guibg=red -hi VertSplit guifg=bisque4 guibg=DarkOliveGreen1 -hi Folded guifg=DarkOliveGreen2 guibg=grey30 -hi FoldColumn guifg=DarkOliveGreen2 guibg=grey30 -hi IncSearch guifg=bisque guibg=red -hi LineNr guifg=OliveDrab4 guibg=grey15 -hi ModeMsg guifg=khaki3 guibg=grey15 -hi MoreMsg guifg=khaki3 guibg=grey15 -hi NonText guifg=DarkSalmon guibg=grey10 -hi Question guifg=IndianRed guibg=grey10 -hi Search guifg=DarkSalmon guibg=grey15 -hi SpecialKey guifg=yellow guibg=grey15 -hi StatusLine guifg=bisque4 guibg=DarkOliveGreen1 -hi StatusLineNC guifg=bisque4 guibg=DarkOliveGreen3 -hi Title guifg=IndianRed guibg=grey15 -hi Visual guifg=OliveDrab4 guibg=bisque1 -hi WarningMsg guifg=bisque guibg=red -hi WildMenu guifg=LightBlue guibg=DarkViolet - - -"Syntax hilight groups - -hi Comment guifg=tan -hi Constant guifg=khaki -hi String guifg=moccasin -hi Character guifg=chocolate -hi Number guifg=chocolate -hi Boolean guifg=OliveDrab3 -hi Float guifg=chocolate -hi Identifier guifg=khaki4 -hi Function guifg=OliveDrab4 -hi Statement guifg=khaki -hi Conditional guifg=khaki -hi Repeat guifg=khaki -hi Label guifg=khaki -hi Operator guifg=DarkKhaki -hi Keyword guifg=DarkKhaki -hi Exception guifg=khaki -hi PreProc guifg=khaki4 -hi Include guifg=khaki4 -hi Define guifg=khaki1 -hi Macro guifg=khaki2 -hi PreCondit guifg=khaki3 -hi Type guifg=khaki3 -hi StorageClass guifg=tan -hi Structure guifg=DarkGoldenrod -hi Typedef guifg=khaki3 -hi Special guifg=IndianRed -hi SpecialChar guifg=DarkGoldenrod -hi Tag guifg=DarkKhaki -hi Delimiter guifg=DarkGoldenrod -hi SpecialComment guifg=cornsilk -hi Debug guifg=brown -hi Underlined guifg=IndianRed -hi Ignore guifg=grey30 -hi Error guifg=bisque guibg=red -hi Todo guifg=red guibg=bisque - diff --git a/pack/local/opt/earendel/colors/earendel.vim b/pack/local/opt/earendel/colors/earendel.vim deleted file mode 100644 index e49aefe..0000000 --- a/pack/local/opt/earendel/colors/earendel.vim +++ /dev/null @@ -1,161 +0,0 @@ -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "earendel" - -execute "command! -nargs=1 Colo set background=" - -if &background == "light" - hi Normal ctermbg=15 ctermfg=0 guibg=#f0f0f0 guifg=#000000 gui=none - - hi ColorColumn ctermbg=7 ctermfg=fg guibg=#d5d5d5 gui=none - hi Cursor guibg=#000000 guifg=#ffffff gui=none - hi CursorColumn ctermbg=7 ctermfg=fg guibg=#e0e0e0 gui=none - hi CursorLine ctermbg=7 ctermfg=fg guibg=#e0e0e0 gui=none - hi DiffAdd guibg=#bae981 guifg=fg gui=none - hi DiffChange guibg=#8495e6 guifg=fg gui=none - hi DiffDelete guibg=#ff95a5 guifg=fg gui=none - hi DiffText guibg=#b9c2f0 guifg=fg gui=bold - hi Directory guibg=bg guifg=#272fc2 gui=none - hi ErrorMsg guibg=#ca001f guifg=#ffffff gui=bold - hi FoldColumn ctermbg=bg guibg=bg guifg=#656565 gui=none - hi Folded guibg=#cacaca guifg=#324263 gui=bold - hi IncSearch guibg=#f7b69d gui=none - hi LineNr guibg=bg guifg=#656565 gui=none - hi ModeMsg ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold - hi MoreMsg guibg=bg guifg=#4a4a4a gui=bold - hi NonText ctermfg=8 guibg=bg guifg=#656565 gui=bold - hi Pmenu guibg=#aab8d5 guifg=fg gui=none - hi PmenuSbar guibg=#6a83b5 guifg=fg gui=none - hi PmenuSel guibg=#fee06b guifg=fg gui=none - hi PmenuThumb guibg=#c7cfe2 guifg=fg gui=none - hi Question guibg=bg guifg=#4a4a4a gui=bold - hi Search guibg=#fee481 gui=none - hi SignColumn ctermbg=bg guibg=bg guifg=#656565 gui=none - hi SpecialKey guibg=bg guifg=#844631 gui=none - hi StatusLine ctermbg=0 ctermfg=15 guibg=#96aad3 guifg=fg gui=bold - hi StatusLineNC ctermbg=7 ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none - if has("spell") - hi SpellBad guisp=#ca001f gui=undercurl - hi SpellCap guisp=#272fc2 gui=undercurl - hi SpellLocal guisp=#0f8674 gui=undercurl - hi SpellRare guisp=#d16c7a gui=undercurl - endif - hi TabLine guibg=#d4d4d4 guifg=fg gui=underline - hi TabLineFill guibg=#d4d4d4 guifg=fg gui=underline - hi TabLineSel guibg=bg guifg=fg gui=bold - hi Title guifg=fg gui=bold - hi VertSplit ctermbg=7 ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none - if version >= 700 - hi Visual ctermbg=7 ctermfg=fg guibg=#bfbfbf gui=none - else - hi Visual ctermbg=7 ctermfg=fg guibg=#bfbfbf guifg=fg gui=none - endif - hi VisualNOS ctermbg=8 ctermfg=fg guibg=bg guifg=#324263 gui=bold,underline - hi WarningMsg guibg=bg guifg=#ca001f gui=bold - hi WildMenu guibg=#fedc56 guifg=fg gui=bold - - hi Comment guibg=bg guifg=#558817 gui=none - hi Constant guibg=bg guifg=#a8660d gui=none - hi Error guibg=bg guifg=#bf001d gui=none - hi Identifier guibg=bg guifg=#0e7c6b gui=none - hi Ignore guibg=bg guifg=bg gui=none - hi lCursor guibg=#79bf21 guifg=#ffffff gui=none - hi MatchParen guibg=#0f8674 guifg=#ffffff gui=none - hi PreProc guibg=bg guifg=#a33243 gui=none - hi Special guibg=bg guifg=#844631 gui=none - hi Statement guibg=bg guifg=#2239a8 gui=bold - hi Todo guibg=#fedc56 guifg=#512b1e gui=bold - hi Type guibg=bg guifg=#1d318d gui=bold - hi Underlined ctermbg=bg ctermfg=fg guibg=bg guifg=#272fc2 gui=underline - - hi htmlBold ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold - hi htmlBoldItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,italic - hi htmlBoldUnderline ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,underline - hi htmlBoldUnderlineItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,underline,italic - hi htmlItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=italic - hi htmlUnderline ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=underline - hi htmlUnderlineItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=underline,italic -else - hi Normal ctermbg=0 ctermfg=7 guibg=#303030 guifg=#cacaca gui=none - - hi ColorColumn ctermbg=8 ctermfg=15 guibg=#4a4a4a gui=none - hi Cursor guibg=#e5e5e5 guifg=#000000 gui=none - hi CursorColumn ctermbg=8 ctermfg=15 guibg=#404040 gui=none - hi CursorLine ctermbg=8 ctermfg=15 guibg=#404040 gui=none - hi DiffAdd guibg=#558817 guifg=#dadada gui=none - hi DiffChange guibg=#1b2e85 guifg=#dadada gui=none - hi DiffDelete guibg=#9f0018 guifg=#dadada gui=none - hi DiffText guibg=#2540ba guifg=#dadada gui=bold - hi Directory guibg=bg guifg=#8c91e8 gui=none - hi ErrorMsg guibg=#ca001f guifg=#e5e5e5 gui=bold - hi FoldColumn ctermbg=bg guibg=bg guifg=#9a9a9a gui=none - hi Folded guibg=#555555 guifg=#bfcadf gui=bold - hi IncSearch guibg=#a7380e guifg=#dadada gui=none - hi LineNr guibg=bg guifg=#9a9a9a gui=none - hi ModeMsg ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold - hi MoreMsg guibg=bg guifg=#b5b5b5 gui=bold - hi NonText ctermfg=8 guibg=bg guifg=#9a9a9a gui=bold - hi Pmenu guibg=#3d5078 guifg=#dadada gui=none - hi PmenuSbar guibg=#324263 guifg=#dadada gui=none - hi PmenuSel guibg=#f3c201 guifg=#000000 gui=none - hi PmenuThumb guibg=#5c77ad guifg=#dadada gui=none - hi Question guibg=bg guifg=#b5b5b5 gui=bold - hi Search guibg=#947601 guifg=#dadada gui=none - hi SignColumn ctermbg=bg guibg=bg guifg=#9a9a9a gui=none - hi SpecialKey guibg=bg guifg=#d3a901 gui=none - hi StatusLine ctermbg=7 ctermfg=0 guibg=#41609e guifg=#e5e5e5 gui=bold - hi StatusLineNC ctermbg=7 ctermfg=0 guibg=#35466a guifg=#afbacf gui=none - if has("spell") - hi SpellBad guisp=#ea0023 gui=undercurl - hi SpellCap guisp=#8c91e8 gui=undercurl - hi SpellLocal guisp=#16c9ae gui=undercurl - hi SpellRare guisp=#e09ea8 gui=undercurl - endif - hi TabLine guibg=#4a4a4a guifg=#e5e5e5 gui=underline - hi TabLineFill guibg=#4a4a4a guifg=#e5e5e5 gui=underline - hi TabLineSel guibg=bg guifg=#e5e5e5 gui=bold - hi Title ctermbg=bg ctermfg=15 guifg=#e5e5e5 gui=bold - hi VertSplit ctermbg=7 ctermfg=0 guibg=#35466a guifg=#afbacf gui=none - if version >= 700 - hi Visual ctermbg=7 ctermfg=0 guibg=#606060 gui=none - else - hi Visual ctermbg=7 ctermfg=0 guibg=#606060 guifg=fg gui=none - endif - hi VisualNOS ctermbg=8 ctermfg=0 guibg=bg guifg=#bfcadf gui=bold,underline - hi WarningMsg guibg=bg guifg=#ea0023 gui=bold - hi WildMenu guibg=#fbca01 guifg=#000000 gui=bold - - hi Comment guibg=bg guifg=#77be21 gui=none - hi Constant guibg=bg guifg=#dc8511 gui=none - hi Error guibg=bg guifg=#ea0023 gui=none - hi Identifier guibg=bg guifg=#16c9ae gui=none - hi Ignore guibg=bg guifg=bg gui=none - hi lCursor guibg=#c4ec93 guifg=#000000 gui=none - hi MatchParen guibg=#17d2b7 guifg=#000000 gui=none - hi PreProc guibg=bg guifg=#e09ea8 gui=none - hi Special guibg=bg guifg=#d3a901 gui=none - hi Statement guibg=bg guifg=#a7b4ed gui=bold - hi Todo guibg=#fedc56 guifg=#512b1e gui=bold - hi Type guibg=bg guifg=#95a4ea gui=bold - hi Underlined ctermbg=bg ctermfg=15 guibg=bg guifg=#8c91e8 gui=underline - - hi htmlBold ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold - hi htmlBoldItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,italic - hi htmlBoldUnderline ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,underline - hi htmlBoldUnderlineItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic - hi htmlItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=italic - hi htmlUnderline ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=underline - hi htmlUnderlineItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=underline,italic -endif - -hi! default link bbcodeBold htmlBold -hi! default link bbcodeBoldItalic htmlBoldItalic -hi! default link bbcodeBoldItalicUnderline htmlBoldUnderlineItalic -hi! default link bbcodeBoldUnderline htmlBoldUnderline -hi! default link bbcodeItalic htmlItalic -hi! default link bbcodeItalicUnderline htmlUnderlineItalic -hi! default link bbcodeUnderline htmlUnderline diff --git a/pack/local/opt/faded-black/colors/faded-black.vim b/pack/local/opt/faded-black/colors/faded-black.vim deleted file mode 100644 index 37c945b..0000000 --- a/pack/local/opt/faded-black/colors/faded-black.vim +++ /dev/null @@ -1,89 +0,0 @@ -" Vim color file -" Maintainer: John Kaul -" Created On: 2003 Mar 19 -" Last Change: 2013 Jan 16 - -" Notes: -" This started as a fadded version of of the 'Chocolate Liquor', but -" soon took on a life of its own. Easy on the eyes, but still has good -" contrast. I dont think there is any 'Chocolate Liquor' left in this -" file, but there is prolly an entry or two left in there somewhere. -" -" Only values that differ from defaults are specified. -" -" 01.07.05 update: Tweeked a few colors and added terminal colors. -" Please note that I didnt go thru the terminal colors very well. (I -" just added a few ''dif. then normal'' colors) If you use the terminal -" alot I would make an attempt to fix anything you dont like about this -" color scheme if I were you. :)~ Other than that, I just called it it -" good 'nuff. -" -" 01.16.13 update: Changed a few more colors (still havent looked at the -" terminal colors). -" -" I hope you enjoy... - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "faded-black" - - -" Vim >= 7.0 specific colors -if version >= 700 - -hi CursorLine ctermbg=236 ctermfg=NONE guibg=#2d2d2d guifg=NONE term=NONE gui=NONE -hi CursorColumn ctermbg=236 ctermfg=NONE guibg=#2d2d2d guifg=NONE term=NONE gui=NONE -hi MatchParen ctermbg=237 ctermfg=157 guibg=#2f2f2f guifg=#d0ffc0 term=bold gui=bold -hi Pmenu ctermbg=238 ctermfg=255 guibg=#444444 guifg=#ffffff term=NONE gui=NONE -hi PmenuSel ctermbg=148 ctermfg=0 guibg=#b1d631 guifg=#000000 term=NONE gui=NONE - -endif - -" //-- Stuff --// -hi Cursor ctermbg=Red ctermfg=NONE guibg=#8b3a3a guifg=#e3e3e3 gui=NONE -hi Normal ctermbg=NONE ctermfg=LightGrey guibg=#03080F guifg=#958a73 gui=NONE -" hi Normal ctermbg=NONE ctermfg=LightGrey guibg=#03080F guifg=#a69d89 gui=NONE -" The text color between the above two are tough to decide; I leave it up to you. -hi NonText ctermbg=NONE ctermfg=Black guibg=#03080F guifg=#000030 gui=NONE -hi DiffDelete ctermbg=DarkRed ctermfg=White guibg=DarkRed guifg=White gui=NONE -hi DiffAdd ctermbg=DarkGreen ctermfg=White guibg=DarkGreen guifg=White gui=NONE -hi DiffText ctermbg=LightCyan ctermfg=Yellow guibg=Lightblue guifg=Yellow gui=NONE -hi DiffChange ctermbg=LightBlue ctermfg=White guibg=LightBlue3 guifg=White gui=NONE -hi Constant ctermbg=NONE ctermfg=Red guibg=NONE guifg=#872e30 gui=NONE -hi StatusLine ctermbg=DarkGrey ctermfg=Red guibg=DarkGrey guifg=LightRed gui=italic -hi StatusLineNC ctermbg=Darkgrey ctermfg=black guibg=DarkGrey guifg=Black gui=NONE -hi VertSplit ctermbg=NONE ctermfg=NONE guibg=NONE guifg=Grey gui=NONE -hi Visual ctermbg=DarkRed ctermfg=Red guibg=#6b6b6b guifg=#431818 term=reverse -hi Search ctermbg=NONE ctermfg=LightGrey guibg=#80363a guifg=#a69c89 gui=NONE -hi Label ctermbg=NONE ctermfg=NONE guibg=NONE guifg=#ffc0c0 gui=NONE -hi LineNr ctermbg=NONE ctermfg=Red guibg=NONE guifg=#A39274 gui=NONE - -" //-- Messages --// -hi MoreMsg ctermbg=NONE ctermfg=DarkGreen guibg=NONE guifg=SeaGreen term=bold,italic gui=bold -hi question ctermbg=NONE ctermfg=DarkGreen guibg=NONE guifg=SeaGreen term=standout gui=bold - -" //-- Syntax group --// -hi Comment ctermbg=NONE ctermfg=DarkGreen guibg=NONE guifg=#545f3a gui=italic -hi PreProc ctermbg=NONE ctermfg=NONE guibg=NONE guifg=#bbaccc gui=NONE -hi Statement ctermbg=NONE ctermfg=Yellow guibg=NONE guifg=#ab952b gui=NONE -hi Type ctermbg=NONE ctermfg=darkmagenta guibg=NONE guifg=#ba5bdb gui=NONE -hi Identifier ctermbg=NONE ctermfg=Yellow guibg=NONE guifg=#737d95 gui=NONE -hi Special ctermbg=NONE ctermfg=Green guibg=NONE guifg=#5b5646 gui=NONE -hi Todo ctermbg=NONE ctermfg=NONE guibg=NONE guifg=LightBlue gui=bold,italic -hi Number ctermbg=NONE ctermfg=NONE guibg=NONE guifg=lightblue gui=NONE -" -" Lisp stuff -hi lispAtomMark ctermbg=NONE ctermfg=cyan guifg=darkcyan guibg=NONE gui=NONE -hi lispNumber ctermbg=NONE ctermfg=DarkGreen guifg=lightblue guibg=NONE gui=NONE -" -" hi Constant -" hi Error -" hi Ignore -" hi Underlined - -" //-- Fold --// -hi Folded ctermbg=NONE ctermfg=NONE guibg=#001a33 guifg=#a69c89 gui=italic -hi FoldColumn ctermbg=NONE ctermfg=Yellow guibg=#6699CC guifg=#0000EE gui=NONE diff --git a/pack/local/opt/freya b/pack/local/opt/freya new file mode 160000 index 0000000..03d3701 --- /dev/null +++ b/pack/local/opt/freya @@ -0,0 +1 @@ +Subproject commit 03d37018bde88bac9322b14b3f59307b054ae13c diff --git a/pack/local/opt/freya/colors/freya.vim b/pack/local/opt/freya/colors/freya.vim deleted file mode 100644 index d190851..0000000 --- a/pack/local/opt/freya/colors/freya.vim +++ /dev/null @@ -1,79 +0,0 @@ -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "freya" - -hi Normal ctermbg=0 ctermfg=7 cterm=none guibg=#2a2a2a guifg=#dcdccc gui=none - -hi Cursor guibg=fg guifg=bg gui=none -hi CursorColumn guibg=#3f3f3f gui=none -hi CursorLine guibg=#3f3f3f gui=none -hi DiffAdd guibg=#008b00 guifg=fg gui=none -hi DiffChange guibg=#00008b guifg=fg gui=none -hi DiffDelete guibg=#8b0000 guifg=fg gui=none -hi DiffText guibg=#0000cd guifg=fg gui=bold -hi Directory guibg=bg guifg=#d4b064 gui=none -hi ErrorMsg guibg=bg guifg=#f07070 gui=bold -hi FoldColumn ctermbg=bg guibg=bg guifg=#c2b680 gui=none -hi Folded guibg=#101010 guifg=#c2b680 gui=none -hi IncSearch guibg=#866a4f guifg=fg gui=none -hi LineNr guibg=bg guifg=#9f8f80 gui=none -hi ModeMsg guibg=bg guifg=fg gui=bold -hi MoreMsg guibg=bg guifg=#dabfa5 gui=bold -hi NonText ctermfg=8 guibg=bg guifg=#9f8f80 gui=bold -hi Pmenu guibg=#a78869 guifg=#000000 gui=none -hi PmenuSbar guibg=#B99F86 guifg=fg gui=none -hi PmenuSel guibg=#c0aa94 guifg=bg gui=none -hi PmenuThumb guibg=#f7f7f1 guifg=bg gui=none -hi Question guibg=bg guifg=#dabfa5 gui=bold -hi Search guibg=#c0aa94 guifg=bg gui=none -hi SignColumn ctermbg=bg guibg=bg guifg=#c2b680 gui=none -hi SpecialKey guibg=bg guifg=#d4b064 gui=none -if has("spell") - hi SpellBad guisp=#f07070 gui=undercurl - hi SpellCap guisp=#7070f0 gui=undercurl - hi SpellLocal guisp=#70f0f0 gui=undercurl - hi SpellRare guisp=#f070f0 gui=undercurl -endif -hi StatusLine ctermbg=7 ctermfg=0 guibg=#736559 guifg=#f7f7f1 gui=bold -hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#564d43 guifg=#f7f7f1 gui=none -hi TabLine guibg=#564d43 guifg=#f7f7f1 gui=underline -hi TabLineFill guibg=#564d43 guifg=#f7f7f1 gui=underline -hi TabLineSel guibg=bg guifg=#f7f7f1 gui=bold -hi Title ctermbg=0 ctermfg=15 guifg=#f7f7f1 gui=bold -hi VertSplit ctermbg=7 ctermfg=0 guibg=#564d43 guifg=#f7f7f1 gui=none -if version >= 700 - hi Visual ctermbg=7 ctermfg=0 guibg=#5f5f5f gui=none -else - hi Visual ctermbg=7 ctermfg=0 guibg=#5f5f5f guifg=fg gui=none -endif -hi VisualNOS guibg=bg guifg=#c0aa94 gui=bold,underline -hi WarningMsg guibg=bg guifg=#f07070 gui=none -hi WildMenu guibg=#c0aa94 guifg=bg gui=bold - -hi Comment guibg=bg guifg=#c2b680 gui=none -hi Constant guibg=bg guifg=#f8af80 gui=none -hi Error guibg=bg guifg=#f07070 gui=none -hi Identifier guibg=bg guifg=#dabfa5 gui=none -hi Ignore guibg=bg guifg=bg gui=none -hi lCursor guibg=#c0aa94 guifg=bg gui=none -hi MatchParen guibg=#008b8b gui=none -hi PreProc guibg=bg guifg=#c2d0ae gui=none -hi Special guibg=bg guifg=#d4b064 gui=none -hi Statement guibg=bg guifg=#e0af91 gui=bold -hi Todo guibg=#aed0ae guifg=bg gui=none -hi Type guibg=bg guifg=#dabfa5 gui=bold -hi Underlined guibg=bg guifg=#d4b064 gui=underline - -hi htmlBold ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold -hi htmlItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=italic -hi htmlUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline -hi htmlBoldItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,italic -hi htmlBoldUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline -hi htmlBoldUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic -hi htmlUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline,italic diff --git a/pack/local/opt/inkpot b/pack/local/opt/inkpot new file mode 160000 index 0000000..b86ad4d --- /dev/null +++ b/pack/local/opt/inkpot @@ -0,0 +1 @@ +Subproject commit b86ad4dc977d3e92ca713c83bc225526a7d77070 diff --git a/pack/local/opt/inkpot/colors/inkpot.vim b/pack/local/opt/inkpot/colors/inkpot.vim deleted file mode 100644 index a062248..0000000 --- a/pack/local/opt/inkpot/colors/inkpot.vim +++ /dev/null @@ -1,212 +0,0 @@ -" Vim color file -" Name: inkpot.vim -" Maintainer: Ciaran McCreesh -" 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 IncSearch gui=BOLD guifg=#303030 guibg=#cd8b60 - hi Search gui=NONE guifg=#303030 guibg=#cd8b60 - 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=#404040 guibg=#8fff8b - endif -else - if ! g:inkpot_black_background - exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(80) - else - exec "hi Normal cterm=NONE ctermfg=" . X(79) . " ctermbg=" . X(16) - endif - - exec "hi IncSearch cterm=BOLD ctermfg=" . X(80) . " ctermbg=" . X(73) - exec "hi Search cterm=NONE ctermfg=" . X(80) . " ctermbg=" . X(73) - 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/pack/local/opt/matrix/colors/matrix.vim b/pack/local/opt/matrix/colors/matrix.vim deleted file mode 100644 index da5c687..0000000 --- a/pack/local/opt/matrix/colors/matrix.vim +++ /dev/null @@ -1,80 +0,0 @@ -" vim:set ts=8 sts=2 sw=2 tw=0: -" -" matrix.vim - MATRIX like colorscheme. -" -" Maintainer: MURAOKA Taro -" Last Change: 10-Jun-2003. - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = 'matrix' - -" the character under the cursor -hi Cursor guifg=#226622 guibg=#55ff55 -hi lCursor guifg=#226622 guibg=#55ff55 -" like Cursor, but used when in IME mode |CursorIM| -hi CursorIM guifg=#226622 guibg=#55ff55 -" directory names (and other special names in listings) -hi Directory guifg=#55ff55 guibg=#000000 -" diff mode: Added line |diff.txt| -hi DiffAdd guifg=#55ff55 guibg=#226622 gui=none -" diff mode: Changed line |diff.txt| -hi DiffChange guifg=#55ff55 guibg=#226622 gui=none -" diff mode: Deleted line |diff.txt| -hi DiffDelete guifg=#113311 guibg=#113311 gui=none -" diff mode: Changed text within a changed line |diff.txt| -hi DiffText guifg=#55ff55 guibg=#339933 gui=bold -" error messages on the command line -hi ErrorMsg guifg=#55ff55 guibg=#339933 -" the column separating vertically split windows -hi VertSplit guifg=#339933 guibg=#339933 -" line used for closed folds -hi Folded guifg=#44cc44 guibg=#113311 -" 'foldcolumn' -hi FoldColumn guifg=#44cc44 guibg=#226622 -" 'incsearch' highlighting; also used for the text replaced with -hi IncSearch guifg=#226622 guibg=#55ff55 gui=none -" line number for ":number" and ":#" commands, and when 'number' -hi LineNr guifg=#44cc44 guibg=#000000 -" 'showmode' message (e.g., "-- INSERT --") -hi ModeMsg guifg=#44cc44 guibg=#000000 -" |more-prompt| -hi MoreMsg guifg=#44cc44 guibg=#000000 -" '~' and '@' at the end of the window, characters from -hi NonText guifg=#44cc44 guibg=#113311 -" normal text -hi Normal guifg=#44cc44 guibg=#000000 -" |hit-enter| prompt and yes/no questions -hi Question guifg=#44cc44 guibg=#000000 -" Last search pattern highlighting (see 'hlsearch'). -hi Search guifg=#113311 guibg=#44cc44 gui=none -" Meta and special keys listed with ":map", also for text used -hi SpecialKey guifg=#44cc44 guibg=#000000 -" status line of current window -hi StatusLine guifg=#55ff55 guibg=#339933 gui=none -" status lines of not-current windows -hi StatusLineNC guifg=#113311 guibg=#339933 gui=none -" titles for output from ":set all", ":autocmd" etc. -hi Title guifg=#55ff55 guibg=#113311 gui=bold -" Visual mode selection -hi Visual guifg=#55ff55 guibg=#339933 gui=none -" Visual mode selection when vim is "Not Owning the Selection". -hi VisualNOS guifg=#44cc44 guibg=#000000 -" warning messages -hi WarningMsg guifg=#55ff55 guibg=#000000 -" current match in 'wildmenu' completion -hi WildMenu guifg=#226622 guibg=#55ff55 - -hi Comment guifg=#226622 guibg=#000000 -hi Constant guifg=#55ff55 guibg=#226622 -hi Special guifg=#44cc44 guibg=#226622 -hi Identifier guifg=#55ff55 guibg=#000000 -hi Statement guifg=#55ff55 guibg=#000000 gui=bold -hi PreProc guifg=#339933 guibg=#000000 -hi Type guifg=#55ff55 guibg=#000000 gui=bold -hi Underlined guifg=#55ff55 guibg=#000000 gui=underline -hi Error guifg=#55ff55 guibg=#339933 -hi Todo guifg=#113311 guibg=#44cc44 gui=none diff --git a/pack/local/opt/mayansmoke/colors/mayansmoke.vim b/pack/local/opt/mayansmoke/colors/mayansmoke.vim deleted file mode 100644 index 6d146f8..0000000 --- a/pack/local/opt/mayansmoke/colors/mayansmoke.vim +++ /dev/null @@ -1,343 +0,0 @@ -" ============================================================================= -" -" File: mayansmoke.vim -" Description: Vim color scheme file -" Maintainer: Jeet Sukumaran (GUI colors); Clayton Parker (cterm colors) -" -" ============================================================================= - -" Initialization and Setup {{{1 -" ============================================================================= -set background=light -highlight clear -if exists("syntax_on") - syntax reset -endif -let colors_name = "mayansmoke" -" }}} - -" Normal Color {{{1 -" ============================================================================= -hi Normal gui=NONE guifg=Black guibg=#F4F4E8 -" }}} - -" Highlight Groups {{{1 -" ============================================================================= -" Groups (see ':help highlight-groups'): -" ColorColumn highlight to use with ':set colorcolumn' -" Cursor the character under the cursor -" CursorIM like Cursor, but used when in IME mode |CursorIM| -" CursorColumn the screen column that the cursor is in when 'cursorcolumn' is set -" CursorLine the screen line that the cursor is in when 'cursorline' is set -" Directory directory names (and other special names in listings) -" DiffAdd diff mode: Added line |diff.txt| -" DiffChange diff mode: Changed line |diff.txt| -" DiffDelete diff mode: Deleted line |diff.txt| -" DiffText diff mode: Changed text within a changed line |diff.txt| -" ErrorMsg error messages on the command line -" VertSplit the column separating vertically split windows -" Folded line used for closed folds -" FoldColumn 'foldcolumn' -" SignColumn column where |signs| are displayed -" IncSearch 'incsearch' highlighting; also used for the text replaced with ":s///c" -" LineNr Line number for ":number" and ":#" commands, and when 'number' option is set. -" MatchParen The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -" ModeMsg 'showmode' message (e.g., "-- INSERT --") -" MoreMsg |more-prompt| -" NonText '~' and '@' at the end of the window, etc. -" Normal normal text -" Pmenu Popup menu: normal item. -" PmenuSel Popup menu: selected item. -" PmenuSbar Popup menu: scrollbar. -" PmenuThumb Popup menu: Thumb of the scrollbar. -" Question |hit-enter| prompt and yes/no questions -" Search Last search pattern highlighting (see 'hlsearch'). -" SpecialKey Meta and special keys listed with ":map", text that is displayed differently from what it really is (such as tabs, spaces in listchars etc.). -" SpellBad Word that is not recognized by the spellchecker. |spell| -" SpellCap Word that should start with a capital. |spell| -" SpellLocal Word that is recognized by the spellchecker as one that is -" SpellRare Word that is recognized by the spellchecker as one that is hardly ever used. |spell| -" StatusLine status line of current window -" StatusLineNC status lines of not-current windows -" TabLine tab pages line, not active tab page label -" TabLineFill tab pages line, where there are no labels -" TabLineSel tab pages line, active tab page label -" Title titles for output from ":set all", ":autocmd" etc. -" Visual Visual mode selection -" VisualNOS Visual mode selection when vim is "Not Owning the Selection". -" WarningMsg warning messages -" WildMenu current match in 'wildmenu' completion -hi ColorColumn guifg=NONE guibg=#EEEEDD -hi Cursor guifg=bg guibg=fg gui=NONE -if hlexists('MayanSmokeCursorLine') - hi link CursorColumn MayanSmokeCursorLine - hi link CursorLine MayanSmokeCursorLine -elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 2 - hi CursorColumn guifg=NONE guibg=NavajoWhite gui=NONE - hi CursorLine guifg=NONE guibg=NavajoWhite gui=NONE -elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 1 - hi CursorColumn guifg=NONE guibg=white gui=NONE - hi CursorLine guifg=NONE guibg=white gui=NONE -else - hi CursorColumn guifg=NONE guibg=#FFFDD0 gui=NONE - hi CursorLine guifg=NONE guibg=#FFFDD0 gui=NONE -endif -hi CursorIM guifg=bg guibg=fg gui=NONE -hi lCursor guifg=bg guibg=fg gui=NONE -hi DiffAdd guifg=NONE guibg=SeaGreen1 gui=NONE -hi DiffChange guifg=NONE guibg=LightSkyBlue1 gui=NONE -hi DiffDelete guifg=NONE guibg=LightCoral gui=NONE -hi DiffText guifg=black guibg=LightCyan1 gui=NONE -hi Directory guifg=#1600FF guibg=bg gui=NONE -hi ErrorMsg guifg=Red2 guibg=NONE gui=NONE -hi FoldColumn guifg=SteelBlue4 guibg=LightYellow2 gui=bold -hi Folded guifg=SteelBlue4 guibg=Gainsboro gui=italic -if hlexists('MayanSmokeSearch') - hi link IncSearch MayanSmokeSearch - hi link Search MayanSmokeSearch -elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility >= 4 - hi IncSearch guifg=white guibg=red gui=NONE - hi Search guifg=white guibg=red gui=NONE -elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 3 - hi IncSearch guifg=black guibg=gold gui=NONE - hi Search guifg=black guibg=gold gui=NONE -elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 2 - hi IncSearch guifg=white guibg=darkorange gui=NONE - hi Search guifg=white guibg=darkorange gui=NONE -elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 0 - hi IncSearch guifg=black guibg=tan gui=NONE - hi Search guifg=black guibg=tan gui=NONE -else - hi IncSearch guifg=black guibg=khaki gui=NONE - hi Search guifg=black guibg=khaki gui=NONE -endif -hi LineNr guifg=#666677 guibg=#cccfbf gui=NONE -hi MatchParen guifg=black guibg=LemonChiffon3 gui=bold -hi ModeMsg guifg=White guibg=tomato1 gui=bold -hi MoreMsg guifg=SeaGreen4 guibg=bg gui=bold -hi NonText guifg=LightCyan3 guibg=bg gui=bold - -hi Pmenu guifg=Orange4 guibg=LightYellow3 gui=NONE -hi PmenuSel guifg=ivory2 guibg=NavajoWhite4 gui=bold -hi PmenuSbar guifg=White guibg=#999666 gui=NONE -hi PmenuThumb guifg=White guibg=#7B7939 gui=NONE - -hi Question guifg=Chartreuse4 guibg=bg gui=bold -hi SignColumn guifg=white guibg=LightYellow3 gui=NONE -if hlexists('MayanSmokeSpecialKey') - hi link SpecialKey MayanSmokeSpecialKey -elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility >= 2 - hi SpecialKey guifg=black guibg=NavajoWhite gui=NONE -elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility == 0 - hi SpecialKey guifg=bisque3 guibg=NONE gui=NONE -else - hi SpecialKey guifg=white guibg=ivory3 gui=NONE -endif -hi SpellBad guisp=Firebrick2 gui=undercurl -hi SpellCap guisp=Blue gui=undercurl -hi SpellLocal guisp=DarkCyan gui=undercurl -hi SpellRare guisp=Magenta gui=undercurl -hi StatusLine guifg=#FFFEEE guibg=#557788 gui=NONE -" hi StatusLineNC guifg=#EAE6E2 guibg=LightSteelBlue3 gui=italic -hi StatusLineNC guifg=#F4F4EE guibg=#99aabb gui=italic -hi TabLine guifg=fg guibg=LightGrey gui=underline -hi TabLineFill guifg=fg guibg=bg gui=reverse -hi TabLineSel guifg=fg guibg=bg gui=bold -hi Title guifg=DeepSkyBlue3 guibg=bg gui=bold -hi VertSplit guifg=#99aabb guibg=#99aabb -hi Visual guifg=white guibg=DeepSkyBlue1 gui=NONE -hi WarningMsg guifg=Firebrick2 guibg=bg gui=NONE -hi WildMenu guifg=Black guibg=SkyBlue gui=NONE -" }}} - -" 256-Color Terminal Colors, by Clayton Parker {{{1 -" ============================================================================= -hi Normal cterm=NONE ctermfg=16 ctermbg=255 -hi Comment ctermfg=110 -hi Constant ctermfg=214 - hi String ctermfg=30 - hi Boolean ctermfg=88 -hi Identifier ctermfg=160 -hi Function ctermfg=132 -hi Statement ctermfg=21 -hi Keyword ctermfg=45 -hi PreProc ctermfg=27 -hi Type ctermfg=147 -hi Special ctermfg=64 -hi Ignore ctermfg=255 -hi Error ctermfg=196 ctermbg=255 term=none -hi Todo ctermfg=136 ctermbg=255 cterm=NONE -hi VimError ctermfg=160 ctermbg=16 -hi VimCommentTitle ctermfg=110 -hi qfLineNr ctermfg=16 ctermbg=46 cterm=NONE -hi pythonDecorator ctermfg=208 ctermbg=255 cterm=NONE -hi Cursor ctermfg=255 ctermbg=16 cterm=NONE -hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE -hi CursorIM ctermfg=255 ctermbg=16 cterm=NONE -hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE -hi lCursor ctermfg=255 ctermbg=16 cterm=NONE -hi DiffAdd ctermfg=16 ctermbg=48 cterm=NONE -hi DiffChange ctermfg=16 ctermbg=153 cterm=NONE -hi DiffDelete ctermfg=16 ctermbg=203 cterm=NONE -hi DiffText ctermfg=16 ctermbg=226 cterm=NONE -hi Directory ctermfg=21 ctermbg=255 cterm=NONE -hi ErrorMsg ctermfg=160 ctermbg=NONE cterm=NONE -hi FoldColumn ctermfg=24 ctermbg=252 cterm=NONE -hi Folded ctermfg=24 ctermbg=252 cterm=NONE -hi IncSearch ctermfg=255 ctermbg=160 cterm=NONE -hi LineNr ctermfg=253 ctermbg=110 cterm=NONE -hi NonText ctermfg=110 ctermbg=255 cterm=NONE -hi Pmenu ctermfg=fg ctermbg=195 cterm=NONE -hi PmenuSbar ctermfg=255 ctermbg=153 cterm=NONE -hi PmenuSel ctermfg=255 ctermbg=21 cterm=NONE -hi PmenuThumb ctermfg=111 ctermbg=255 cterm=NONE -hi SignColumn ctermfg=110 ctermbg=254 cterm=NONE -hi Search ctermfg=255 ctermbg=160 cterm=NONE -hi SpecialKey ctermfg=255 ctermbg=144 cterm=NONE -hi SpellBad ctermfg=16 ctermbg=229 cterm=NONE -hi SpellCap ctermfg=16 ctermbg=231 cterm=NONE -hi SpellLocal ctermfg=16 ctermbg=231 cterm=NONE -hi SpellRare ctermfg=16 ctermbg=226 cterm=NONE -hi StatusLine ctermfg=255 ctermbg=24 cterm=NONE -hi StatusLineNC ctermfg=253 ctermbg=110 cterm=NONE -hi Title ctermfg=75 ctermbg=255 cterm=NONE -hi VertSplit ctermfg=255 ctermbg=24 cterm=NONE -hi Visual ctermfg=255 ctermbg=153 cterm=NONE -hi WildMenu ctermfg=16 ctermbg=117 cterm=NONE - -" 1}}} - -" Syntax {{{1 -" ============================================================================= - -" General {{{2 -" ----------------------------------------------------------------------------- -" Groups ('*' = major; see 'help group-name'): -" *Comment any comment -" *Constant any constant -" String a string constant: "this is a string" -" Character a character constant: 'c', '\n' -" Number a number constant: 234, 0xff -" Boolean a boolean constant: TRUE, false -" Float a floating point constant: 2.3e10 -" *Identifier any variable name -" Function function name (also: methods for classes) -" *Statement any statement -" Conditional if, then, else, endif, switch, etc. -" Repeat for, do, while, etc. -" Label case, default, etc. -" Operator "sizeof", "+", "*", etc. -" Keyword any other keyword -" Exception try, catch, throw -" *PreProc generic Preprocessor -" Include preprocessor #include -" Define preprocessor #define -" Macro same as Define -" PreCondit preprocessor #if, #else, #endif, etc. -" *Type int, long, char, etc. -" StorageClass static, register, volatile, etc. -" Structure struct, union, enum, etc. -" Typedef A typedef -" *Special any special symbol -" SpecialChar special character in a constant -" Tag you can use CTRL-] on this -" Delimiter character that needs attention -" SpecialComment special things inside a comment -" Debug debugging statements -" *Error any erroneous construct -" *Todo anything that needs extra attention -" hi Comment guifg=#A2B5CD guibg=NONE gui=italic -hi Comment guifg=#96AAC2 guibg=NONE gui=italic -hi Constant guifg=DarkOrange guibg=NONE gui=NONE - hi String guifg=Aquamarine4 guibg=NONE gui=NONE - hi Boolean guifg=IndianRed4 guibg=NONE gui=NONE -hi Identifier guifg=brown3 guibg=NONE gui=NONE -hi Function guifg=VioletRed4 guibg=NONE gui=NONE -hi Statement guifg=blue1 guibg=NONE gui=NONE -hi Keyword guifg=DodgerBlue guibg=NONE gui=NONE -hi PreProc guifg=blue1 guibg=NONE gui=NONE -hi Type guifg=LightSlateBlue guibg=NONE gui=NONE -hi Special guifg=DarkOliveGreen4 guibg=NONE gui=NONE -hi Ignore guifg=bg guibg=NONE gui=NONE -hi Error guifg=Red guibg=NONE gui=underline -hi Todo guifg=tan4 guibg=NONE gui=underline -" 2}}} - -" Vim {{{2 -" ----------------------------------------------------------------------------- -hi VimError guifg=red guibg=Black gui=bold -hi VimCommentTitle guifg=DarkSlateGray4 guibg=bg gui=bold,italic -" 2}}} - -" QuickFix {{{2 -" ----------------------------------------------------------------------------- - -" syn match qfFileName "^[^|]*" nextgroup=qfSeparator -" syn match qfSeparator "|" nextgroup=qfLineNr contained -" syn match qfLineNr "[^|]*" contained contains=qfError -" syn match qfError "error" contained -hi qfFileName guifg=LightSkyBlue4 guibg=NONE gui=italic -hi qfLineNr guifg=coral guibg=NONE gui=bold -hi qfError guifg=red guibg=NONE gui=bold -" 2}}} - -" Python {{{2 -" ----------------------------------------------------------------------------- -hi pythonDecorator guifg=orange3 guibg=NONE gui=bold -hi link pythonDecoratorFunction pythonDecorator -" 2}}} - -" Diff {{{2 -" ----------------------------------------------------------------------------- -hi diffOldFile guifg=#006666 guibg=NONE gui=NONE -hi diffNewFile guifg=#0088FF guibg=NONE gui=bold -hi diffFile guifg=#0000FF guibg=NONE gui=NONE -hi link diffOnly Constant -hi link diffIdentical Constant -hi link diffDiffer Constant -hi link diffBDiffer Constant -hi link diffIsA Constant -hi link diffNoEOL Constant -hi link diffCommon Constant -hi diffRemoved guifg=#BB0000 guibg=NONE gui=NONE -hi diffChanged guifg=DarkSeaGreen guibg=NONE gui=NONE -hi diffAdded guifg=#00AA00 guibg=NONE gui=NONE -hi diffLine guifg=thistle4 guibg=NONE gui=italic -hi link diffSubname diffLine -hi link diffComment Comment -" 2}}} - -" PHP (contributed by Ryan Kulla) {{{2 -" ----------------------------------------------------------------------------- -" Ryan Kulla's addition for PHP syntax highlighting (for regular/terminal vim) -hi phpConditional ctermfg=21 cterm=NONE guifg=black -hi phpIdentifier ctermfg=0 cterm=NONE guifg=black -hi phpOperator ctermfg=black cterm=NONE guifg=black -hi phpRegion ctermfg=132 cterm=NONE guifg=VioletRed4 -hi phpComparison ctermfg=black cterm=NONE guifg=black -hi phpType ctermfg=darkgreen cterm=NONE guifg=darkgreen -hi phpParent ctermfg=black cterm=NONE guifg=black -hi phpMethodsVar ctermfg=132 cterm=NONE guifg=VioletRed4 -hi phpStatement ctermfg=21 cterm=NONE guifg=blue -hi phpStorageClass ctermfg=21 cterm=NONE guifg=blue -hi phpStringSingle ctermfg=30 cterm=NONE guifg=Aquamarine4 -hi phpStringDouble ctermfg=30 cterm=NONE guifg=Aquamarine4 -hi phpFunctions ctermfg=21 cterm=NONE guifg=blue -hi phpSpecialFunction ctermfg=21 cterm=NONE guifg=blue -hi phpRepeat ctermfg=21 cterm=NONE guifg=blue -hi phpNumber ctermfg=214 cterm=bold guifg=brown -hi phpTodo ctermfg=red cterm=bold guifg=red gui=bold -hi phpDefine ctermfg=21 cterm=NONE guifg=blue -hi phpConstant ctermfg=21 cterm=NONE guifg=black -hi phpCoreConstant ctermfg=21 cterm=NONE guifg=black -hi phpMemberSelector ctermfg=black cterm=NONE guifg=black -hi phpLabel ctermfg=21 cterm=NONE guifg=blue -hi phpStructure ctermfg=black cterm=NONE guifg=black -hi phpRelation ctermfg=black cterm=NONE guifg=black -hi phpEnvVar ctermfg=black cterm=NONE guifg=black -hi phpIntVar ctermfg=0 cterm=bold guifg=black gui=bold -hi phpBoolean ctermfg=58 cterm=NONE guifg=brown -" 2}}} - -" 1}}} - diff --git a/pack/local/opt/moria b/pack/local/opt/moria new file mode 160000 index 0000000..c687d4e --- /dev/null +++ b/pack/local/opt/moria @@ -0,0 +1 @@ +Subproject commit c687d4e7e22e97fffdc3043afcb4499a09d7eeb2 diff --git a/pack/local/opt/moria/colors/moria.vim b/pack/local/opt/moria/colors/moria.vim deleted file mode 100644 index f03b297..0000000 --- a/pack/local/opt/moria/colors/moria.vim +++ /dev/null @@ -1,205 +0,0 @@ -if exists("g:moria_style") - let s:moria_style = g:moria_style -else - let s:moria_style = &background -endif - -execute "command! -nargs=1 Colo let g:moria_style = \"\" | colo moria" - -if s:moria_style == "black" || s:moria_style == "dark" || s:moria_style == "darkslategray" - set background=dark -elseif s:moria_style == "light" || s:moria_style == "white" - set background=light -else - let s:moria_style = &background -endif - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "moria" - -if &background == "dark" - if s:moria_style == "darkslategray" - hi Normal ctermbg=0 ctermfg=7 guibg=#2f4f4f guifg=#d0d0d0 gui=none - - hi CursorColumn guibg=#404040 gui=none - hi CursorLine guibg=#404040 gui=none - hi FoldColumn ctermbg=bg guibg=bg guifg=#a0c0c0 gui=none - hi Folded guibg=#585858 guifg=#c0e0e0 gui=none - hi LineNr guifg=#a0c0c0 gui=none - hi NonText ctermfg=8 guibg=bg guifg=#a0c0c0 gui=bold - hi Pmenu guibg=#80a0a0 guifg=#000000 gui=none - hi PmenuSbar guibg=#608080 guifg=fg gui=none - hi PmenuThumb guibg=#c0e0e0 guifg=bg gui=none - hi SignColumn ctermbg=bg guibg=bg guifg=#a0c0c0 gui=none - hi StatusLine ctermbg=7 ctermfg=0 guibg=#507070 guifg=fg gui=bold - hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#406060 guifg=fg gui=none - hi TabLine guibg=#567676 guifg=fg gui=underline - hi TabLineFill guibg=#567676 guifg=fg gui=underline - hi VertSplit ctermbg=7 ctermfg=0 guibg=#406060 guifg=fg gui=none - if version >= 700 - hi Visual ctermbg=7 ctermfg=0 guibg=#608080 gui=none - else - hi Visual ctermbg=7 ctermfg=0 guibg=#608080 guifg=fg gui=none - endif - hi VisualNOS guibg=bg guifg=#90b0b0 gui=bold,underline - else - if s:moria_style == "dark" - hi Normal ctermbg=0 ctermfg=7 guibg=#202020 guifg=#d0d0d0 gui=none - - hi CursorColumn guibg=#444444 gui=none - hi CursorLine guibg=#444444 gui=none - elseif s:moria_style == "black" - hi Normal ctermbg=0 ctermfg=7 guibg=#000000 guifg=#d0d0d0 gui=none - - hi CursorColumn guibg=#3a3a3a gui=none - hi CursorLine guibg=#3a3a3a gui=none - endif - hi FoldColumn ctermbg=bg guibg=bg guifg=#a0b0c0 gui=none - hi Folded guibg=#585858 guifg=#c0d0e0 gui=none - hi LineNr guifg=#a0b0c0 gui=none - hi NonText ctermfg=8 guibg=bg guifg=#a0b0c0 gui=bold - hi Pmenu guibg=#8090a0 guifg=#000000 gui=none - hi PmenuSbar guibg=#607080 guifg=fg gui=none - hi PmenuThumb guibg=#c0d0e0 guifg=bg gui=none - hi SignColumn ctermbg=bg guibg=bg guifg=#a0b0c0 gui=none - hi StatusLine ctermbg=7 ctermfg=0 guibg=#485868 guifg=fg gui=bold - hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#304050 guifg=fg gui=none - hi TabLine guibg=#566676 guifg=fg gui=underline - hi TabLineFill guibg=#566676 guifg=fg gui=underline - hi VertSplit ctermbg=7 ctermfg=0 guibg=#304050 guifg=fg gui=none - if version >= 700 - hi Visual ctermbg=7 ctermfg=0 guibg=#607080 gui=none - else - hi Visual ctermbg=7 ctermfg=0 guibg=#607080 guifg=fg gui=none - endif - hi VisualNOS guibg=bg guifg=#90a0b0 gui=bold,underline - endif - hi Cursor guibg=#ffa500 guifg=bg gui=none - hi DiffAdd guibg=#008b00 guifg=fg gui=none - hi DiffChange guibg=#00008b guifg=fg gui=none - hi DiffDelete guibg=#8b0000 guifg=fg gui=none - hi DiffText guibg=#0000cd guifg=fg gui=bold - hi Directory guibg=bg guifg=#1e90ff gui=none - hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold - hi IncSearch guibg=#e0cd78 guifg=#000000 gui=none - hi ModeMsg guibg=bg guifg=fg gui=bold - hi MoreMsg guibg=bg guifg=#7ec0ee gui=bold - hi PmenuSel guibg=#e0e000 guifg=#000000 gui=none - hi Question guibg=bg guifg=#e8b87e gui=bold - hi Search guibg=#90e090 guifg=#000000 gui=none - hi SpecialKey guibg=bg guifg=#e8b87e gui=none - if has("spell") - hi SpellBad guisp=#ee2c2c gui=undercurl - hi SpellCap guisp=#2c2cee gui=undercurl - hi SpellLocal guisp=#2ceeee gui=undercurl - hi SpellRare guisp=#ee2cee gui=undercurl - endif - hi TabLineSel guibg=bg guifg=fg gui=bold - hi Title ctermbg=0 ctermfg=15 guifg=fg gui=bold - hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold - hi WildMenu guibg=#e0e000 guifg=#000000 gui=bold - - hi Comment guibg=bg guifg=#d0d0a0 gui=none - hi Constant guibg=bg guifg=#87df71 gui=none - hi Error guibg=bg guifg=#ee2c2c gui=none - hi Identifier guibg=bg guifg=#7ee0ce gui=none - hi Ignore guibg=bg guifg=bg gui=none - hi lCursor guibg=#00e700 guifg=#000000 gui=none - hi MatchParen guibg=#008b8b gui=none - hi PreProc guibg=bg guifg=#d7a0d7 gui=none - hi Special guibg=bg guifg=#e8b87e gui=none - hi Statement guibg=bg guifg=#7ec0ee gui=none - hi Todo guibg=#e0e000 guifg=#000000 gui=none - hi Type guibg=bg guifg=#f09479 gui=none - hi Underlined guibg=bg guifg=#00a0ff gui=underline - - hi htmlBold ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold - hi htmlItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=italic - hi htmlUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline - hi htmlBoldItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,italic - hi htmlBoldUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline - hi htmlBoldUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic - hi htmlUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline,italic -elseif &background == "light" - if s:moria_style == "light" - hi Normal ctermbg=15 ctermfg=0 guibg=#f0f0f0 guifg=#000000 gui=none - - hi CursorColumn guibg=#d4d4d4 gui=none - hi CursorLine guibg=#d4d4d4 gui=none - elseif s:moria_style == "white" - hi Normal ctermbg=15 ctermfg=0 guibg=#ffffff guifg=#000000 gui=none - - hi CursorColumn guibg=#dbdbdb gui=none - hi CursorLine guibg=#dbdbdb gui=none - endif - hi Cursor guibg=#883400 guifg=bg gui=none - hi DiffAdd guibg=#008b00 guifg=#ffffff gui=none - hi DiffChange guibg=#00008b guifg=#ffffff gui=none - hi DiffDelete guibg=#8b0000 guifg=#ffffff gui=none - hi DiffText guibg=#0000cd guifg=#ffffff gui=bold - hi Directory guibg=bg guifg=#0000f0 gui=none - hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold - hi FoldColumn ctermbg=bg guibg=bg guifg=#506070 gui=none - hi Folded guibg=#c5c5c5 guifg=#203040 gui=none - hi IncSearch guibg=#ffcd78 gui=none - hi LineNr guifg=#506070 gui=none - hi ModeMsg ctermbg=15 ctermfg=0 guibg=bg guifg=fg gui=bold - hi MoreMsg guibg=bg guifg=#1f3f81 gui=bold - hi NonText ctermfg=8 guibg=bg guifg=#506070 gui=bold - hi Pmenu guibg=#8a9aaa guifg=#000000 gui=none - hi PmenuSbar guibg=#708090 guifg=fg gui=none - hi PmenuSel guibg=#ffff00 guifg=#000000 gui=none - hi PmenuThumb guibg=#b0c0d0 guifg=fg gui=none - hi Question guibg=bg guifg=#813f11 gui=bold - hi Search guibg=#a0f0a0 gui=none - hi SignColumn ctermbg=bg guibg=bg guifg=#506070 gui=none - hi SpecialKey guibg=bg guifg=#912f11 gui=none - if has("spell") - hi SpellBad guisp=#ee2c2c gui=undercurl - hi SpellCap guisp=#2c2cee gui=undercurl - hi SpellLocal guisp=#008b8b gui=undercurl - hi SpellRare guisp=#ee2cee gui=undercurl - endif - hi StatusLine ctermbg=0 ctermfg=15 guibg=#a0b0c0 guifg=fg gui=bold - hi StatusLineNC ctermbg=7 ctermfg=0 guibg=#b0c0d0 guifg=fg gui=none - hi TabLine guibg=#b4c4d4 guifg=fg gui=underline - hi TabLineFill guibg=#b4c4d4 guifg=fg gui=underline - hi TabLineSel guibg=bg guifg=fg gui=bold - hi Title guifg=fg gui=bold - hi VertSplit ctermbg=7 ctermfg=0 guibg=#b0c0d0 guifg=fg gui=none - if version >= 700 - hi Visual ctermbg=7 ctermfg=0 guibg=#c0d0e0 gui=none - else - hi Visual ctermbg=7 ctermfg=0 guibg=#c0d0e0 guifg=fg gui=none - endif - hi VisualNOS guibg=bg guifg=#90a0b0 gui=bold,underline - hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold - hi WildMenu guibg=#ffff00 guifg=fg gui=bold - - hi Comment guibg=bg guifg=#786000 gui=none - hi Constant guibg=bg guifg=#077807 gui=none - hi Error guibg=bg guifg=#ee2c2c gui=none - hi Identifier guibg=bg guifg=#007080 gui=none - hi Ignore guibg=bg guifg=bg gui=none - hi lCursor guibg=#008000 guifg=#ffffff gui=none - hi MatchParen guibg=#00ffff gui=none - hi PreProc guibg=bg guifg=#800090 gui=none - hi Special guibg=bg guifg=#912f11 gui=none - hi Statement guibg=bg guifg=#1f3f81 gui=bold - hi Todo guibg=#ffff00 guifg=fg gui=none - hi Type guibg=bg guifg=#912f11 gui=bold - hi Underlined guibg=bg guifg=#0000cd gui=underline - - hi htmlBold guibg=bg guifg=fg gui=bold - hi htmlItalic guibg=bg guifg=fg gui=italic - hi htmlUnderline guibg=bg guifg=fg gui=underline - hi htmlBoldItalic guibg=bg guifg=fg gui=bold,italic - hi htmlBoldUnderline guibg=bg guifg=fg gui=bold,underline - hi htmlBoldUnderlineItalic guibg=bg guifg=fg gui=bold,underline,italic - hi htmlUnderlineItalic guibg=bg guifg=fg gui=underline,italic -endif diff --git a/pack/local/opt/obsidian2/colors/obsidian2.vim b/pack/local/opt/obsidian2/colors/obsidian2.vim deleted file mode 100644 index ad7f64d..0000000 --- a/pack/local/opt/obsidian2/colors/obsidian2.vim +++ /dev/null @@ -1,74 +0,0 @@ -" Vim color file -" Name: Obsidian -" Maintainer: Aydar Khabibullin -" Version: 0.5 -" Date: 01/30/2011 12:35:30 AM - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name="obsidian2" - -let s:Colors = [ -\'#a082bd','#e0e2e4','#93c763', -\'#ffcd22','#ec7600','#ff8409', -\'#e8e2b7','#d39745','#66747b', -\'#678cb1','#5899c0','#5ab9be', -\'#293134','#2f393c','#f3db2e'] - -" Syntax -execute "hi Normal guifg=" . s:Colors[1] . " guibg=" . s:Colors[12] -execute "hi Comment guifg=" . s:Colors[8] . " guibg=" . s:Colors[12] . " gui=italic" -execute "hi Conditional guifg=" . s:Colors[2] . " guibg=" . s:Colors[12] -execute "hi Constant guifg=" . s:Colors[1] . " guibg=" . s:Colors[12] -execute "hi Error guifg=" . s:Colors[7] . " guibg=" . s:Colors[12] -execute "hi Identifier guifg=" . s:Colors[9] . " guibg=" . s:Colors[12] -execute "hi Ignore guifg=" . s:Colors[1] -execute "hi Operator guifg=" . s:Colors[6] . " guibg=" . s:Colors[12] -execute "hi PreProc guifg=" . s:Colors[0] . " guibg=" . s:Colors[12] -execute "hi Repeat guifg=" . s:Colors[2] . " guibg=" . s:Colors[12] -execute "hi Special guifg=" . s:Colors[2] . " guibg=" . s:Colors[12] -execute "hi Statement guifg=" . s:Colors[2] . " guibg=" . s:Colors[12] -execute "hi Number guifg=" . s:Colors[3] . " guibg=" . s:Colors[12] -execute "hi Boolean guifg=" . s:Colors[11] . " guibg=" . s:Colors[12] -execute "hi String guifg=" . s:Colors[5] . " guibg=" . s:Colors[12] -execute "hi Character guifg=" . s:Colors[5] . " guibg=" . s:Colors[12] -execute "hi Title guifg=" . s:Colors[1] . " guibg=" . s:Colors[12] -execute "hi Todo guifg=" . s:Colors[12] . " guibg=" . s:Colors[0] . " gui=bold guisp=NONE" -execute "hi Type guifg=" . s:Colors[9] . " guibg=" . s:Colors[12] -execute "hi Underline guifg=" . s:Colors[10] . " guibg=" . s:Colors[12] - -" Groups -execute "hi Cursor guifg=" . s:Colors[8] . " guibg=" . s:Colors[4] -execute "hi CursorIM guifg=" . s:Colors[7] . " guibg=" . s:Colors[4] -execute "hi CursorLine guifg=NONE guibg=" . s:Colors[13] -execute "hi CursorColumn guifg=". s:Colors[1] . " guibg=" . s:Colors[13] -execute "hi Directory guifg=" . s:Colors[10] . " guibg=" . s:Colors[12] -execute "hi ErrorMsg guifg=" . s:Colors[13] . " guibg=" . s:Colors[7] -execute "hi FoldColumn guifg=" . s:Colors[13] . " guibg=" . s:Colors[12] -execute "hi Folded guifg=" . s:Colors[12] . " guibg=" . s:Colors[11] -execute "hi IncSearch guifg=" . s:Colors[1] . " guibg=" . s:Colors[12] . " gui=none" -execute "hi LineNr guifg=" . s:Colors[8] . " guibg=" . s:Colors[12] . " gui=none" -execute "hi MatchParen guifg=" . s:Colors[12] . " guibg=" . s:Colors[4] . " gui=bold" -execute "hi ModeMsg guifg=" . s:Colors[5] . " guibg=" . s:Colors[12] -execute "hi MoreMsg guifg=" . s:Colors[5] . " guibg=" . s:Colors[12] -execute "hi NonText guifg=" . s:Colors[1] . " guibg=" . s:Colors[12] -execute "hi Pmenu guifg=" . s:Colors[1] . " guibg=" . s:Colors[8] -execute "hi PmenuSel guifg=" . s:Colors[13] . " guibg=" . s:Colors[9] -execute "hi Question guifg=" . s:Colors[0] . " guibg=" . s:Colors[12] -execute "hi Search guifg=" . s:Colors[0] . " guibg=" . s:Colors[12] -execute "hi SpecialKey guifg=" . s:Colors[10] . " guibg=" . s:Colors[12] -execute "hi StatusLine guifg=" . s:Colors[1] . " guibg=" . s:Colors[9] . " gui=none" -execute "hi StatusLineNC guifg=" . s:Colors[1] . " guibg=" . s:Colors[8] . " gui=none" -execute "hi TabLine guifg=" . s:Colors[8] . " guibg=" . s:Colors[12] . " gui=none" -execute "hi TabLineFill guifg=" . s:Colors[12] . " guibg=" . s:Colors[13] . " gui=none" -execute "hi TabLineSel guifg=" . s:Colors[1] . " guibg=" . s:Colors[13] . " gui=none" -execute "hi Tooltip guifg=" . s:Colors[9] . " guibg=" . s:Colors[8] . " gui=none" -execute "hi VertSplit guifg=" . s:Colors[0] . " guibg=" . s:Colors[13] . " gui=none" -execute "hi Visual guifg=" . s:Colors[1] . " guibg=" . s:Colors[0] . " gui=none" -hi VisualNOS gui=none guibg=black -execute "hi WarningMsg guifg=" . s:Colors[5] . " guibg=" . s:Colors[12] . " gui=none" -execute "hi WildMenu guifg=" . s:Colors[14] . " guibg=" . s:Colors[5] . " gui=none" - diff --git a/pack/local/opt/oceandeep/colors/oceandeep.vim b/pack/local/opt/oceandeep/colors/oceandeep.vim deleted file mode 100644 index c19b2c0..0000000 --- a/pack/local/opt/oceandeep/colors/oceandeep.vim +++ /dev/null @@ -1,111 +0,0 @@ -" Vim color file -" Maintainer: Tom Regner -" Last Change: 2002-12-05 -" Version: 1.1 -" URL: http://vim.sourceforge.net/script.php?script_id=368 - - -""" Init -set background=dark -highlight clear -if exists("syntax_on") - syntax reset -endif -let g:colors_name = "oceandeep" - - -""""""""\ Colors \"""""""" - - -"""" GUI Colors - -highlight Cursor gui=None guibg=PaleTurquoise3 guifg=White -highlight CursorIM gui=bold guifg=white guibg=PaleTurquoise3 -highlight Directory guifg=LightSeaGreen guibg=bg -highlight DiffAdd gui=None guifg=fg guibg=DarkCyan -highlight DiffChange gui=None guifg=fg guibg=Green4 -highlight DiffDelete gui=None guifg=fg guibg=black -highlight DiffText gui=bold guifg=fg guibg=bg -highlight ErrorMsg guifg=LightYellow guibg=FireBrick -" previously 'FillColumn': -"highlight FillColumn gui=NONE guifg=black guibg=grey60 -highlight VertSplit gui=NONE guifg=black guibg=grey60 -highlight Folded gui=bold guibg=#305060 guifg=#b0d0e0 -highlight FoldColumn gui=bold guibg=#305060 guifg=#b0d0e0 -highlight IncSearch gui=reverse guifg=fg guibg=bg -highlight LineNr gui=bold guibg=grey6 guifg=LightSkyBlue3 -highlight ModeMsg guibg=DarkGreen guifg=LightGreen -highlight MoreMsg gui=bold guifg=SeaGreen4 guibg=bg -if version < 600 - " same as SpecialKey - highlight NonText guibg=#123A4A guifg=#3D5D6D -else - " Bottom fill (use e.g. same as LineNr) - highlight NonText gui=None guibg=#103040 guifg=LightSkyBlue -endif -highlight Normal gui=None guibg=#103040 guifg=honeydew2 -highlight Question gui=bold guifg=SeaGreen2 guibg=bg -highlight Search gui=NONE guibg=LightSkyBlue4 guifg=NONE -highlight SpecialKey guibg=#103040 guifg=#324262 -highlight StatusLine gui=bold guibg=grey88 guifg=black -highlight StatusLineNC gui=NONE guibg=grey60 guifg=grey10 -highlight Title gui=bold guifg=MediumOrchid1 guibg=bg -highlight Visual gui=reverse guibg=WHITE guifg=SeaGreen -highlight VisualNOS gui=bold,underline guifg=fg guibg=bg -highlight WarningMsg gui=bold guifg=FireBrick1 guibg=bg -highlight WildMenu gui=bold guibg=Chartreuse guifg=Black - - -"""" Syntax Colors - -"highlight Comment gui=reverse guifg=#507080 -highlight Comment gui=None guifg=#507080 - -highlight Constant guifg=cyan3 guibg=bg -hi String gui=None guifg=turquoise2 guibg=bg - "hi Character gui=None guifg=Cyan guibg=bg - highlight Number gui=None guifg=Cyan guibg=bg - highlight Boolean gui=bold guifg=Cyan guibg=bg - "hi Float gui=None guifg=Cyan guibg=bg - -highlight Identifier guifg=LightSkyBlue3 -hi Function gui=None guifg=DarkSeaGreen3 guibg=bg - -highlight Statement gui=NONE guifg=LightGreen - highlight Conditional gui=None guifg=LightGreen guibg=bg - highlight Repeat gui=None guifg=SeaGreen2 guibg=bg - "hi Label gui=None guifg=LightGreen guibg=bg - highlight Operator gui=None guifg=Chartreuse guibg=bg - highlight Keyword gui=bold guifg=LightGreen guibg=bg - highlight Exception gui=bold guifg=LightGreen guibg=bg - -highlight PreProc guifg=SkyBlue1 -hi Include gui=None guifg=LightSteelBlue3 guibg=bg -hi Define gui=None guifg=LightSteelBlue2 guibg=bg -hi Macro gui=None guifg=LightSkyBlue3 guibg=bg -hi PreCondit gui=None guifg=LightSkyBlue2 guibg=bg - -highlight Type gui=NONE guifg=LightBlue -hi StorageClass gui=None guifg=LightBlue guibg=bg -hi Structure gui=None guifg=LightBlue guibg=bg -hi Typedef gui=None guifg=LightBlue guibg=bg - -highlight Special gui=bold guifg=aquamarine3 - "hi SpecialChar gui=bold guifg=White guibg=bg - "hi Tag gui=bold guifg=White guibg=bg - "hi Delimiter gui=bold guifg=White guibg=bg - "hi SpecialComment gui=bold guifg=White guibg=bg - "hi Debug gui=bold guifg=White guibg=bg - -highlight Underlined gui=underline guifg=honeydew4 guibg=bg - -highlight Ignore guifg=#204050 - -highlight Error guifg=LightYellow guibg=FireBrick - -highlight Todo guifg=Cyan guibg=#507080 - -""" OLD COLORS - - - diff --git a/pack/local/opt/peaksea/colors/peaksea.vim b/pack/local/opt/peaksea/colors/peaksea.vim deleted file mode 100644 index 2466360..0000000 --- a/pack/local/opt/peaksea/colors/peaksea.vim +++ /dev/null @@ -1,601 +0,0 @@ -" Vim color file --- psc (peak sea color) "Lite version" -" Maintainer: Pan, Shi Zhu -" URL: http://vim.sourceforge.net/scripts/script.php?script_id=760 -" Last Change: 5 Feb 2010 -" Version: 3.4 -" -" Comments and e-mails are welcomed, thanks. -" -" The peaksea color is simply a colorscheme with the default settings of -" the original ps_color. Lite version means there's no custom settings -" and fancy features such as integration with reloaded.vim -" -" The full version of ps_color.vim will be maintained until Vim 8. -" By then there will be only the lite version: peaksea.vim -" -" Note: Please set the background option in your .vimrc and/or .gvimrc -" -" It is much better *not* to set 'background' option inside -" a colorscheme file. because ":set background" improperly -" may cause colorscheme be sourced twice -" -" Color Scheme Overview: -" :ru syntax/hitest.vim -" -" Relevant Help: -" :h highlight-groups -" :h psc-cterm-color-table -" -" Colors Order: -" #rrggbb -" - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = expand(":t:r") - -" I don't want to abuse folding, but here folding is used to avoid confusion. -if &background=='light' - " for background=light {{{2 - " LIGHT COLOR DEFINE START - - hi Normal guifg=#000000 guibg=#e0e0e0 gui=NONE - hi Search guifg=NONE guibg=#f8f8f8 gui=NONE - hi Visual guifg=NONE guibg=#a6caf0 gui=NONE - hi Cursor guifg=#f0f0f0 guibg=#008000 gui=NONE - " The idea of CursorIM is pretty good, however, the feature is still buggy - " in the current version (Vim 7.0). - " The following line will be kept commented until the bug fixed. - " - " hi CursorIM guifg=#f0f0f0 guibg=#800080 - hi Special guifg=#907000 guibg=NONE gui=NONE - hi Comment guifg=#606000 guibg=NONE gui=NONE - hi Number guifg=#907000 guibg=NONE gui=NONE - hi Constant guifg=#007068 guibg=NONE gui=NONE - hi StatusLine guifg=fg guibg=#a6caf0 gui=NONE - hi LineNr guifg=#686868 guibg=NONE gui=NONE - hi Question guifg=fg guibg=#d0d090 gui=NONE - hi PreProc guifg=#009030 guibg=NONE gui=NONE - hi Statement guifg=#2060a8 guibg=NONE gui=NONE - hi Type guifg=#0850a0 guibg=NONE gui=NONE - hi Todo guifg=#800000 guibg=#e0e090 gui=NONE - " NOTE THIS IS IN THE WARM SECTION - hi Error guifg=#c03000 guibg=NONE gui=NONE - hi Identifier guifg=#a030a0 guibg=NONE gui=NONE - hi ModeMsg guifg=fg guibg=#b0b0e0 gui=NONE - hi VisualNOS guifg=fg guibg=#b0b0e0 gui=NONE - hi SpecialKey guifg=#1050a0 guibg=NONE gui=NONE - hi NonText guifg=#002090 guibg=#d0d0d0 gui=NONE - hi Directory guifg=#a030a0 guibg=NONE gui=NONE - hi ErrorMsg guifg=fg guibg=#f0b090 gui=NONE - hi MoreMsg guifg=#489000 guibg=NONE gui=NONE - hi Title guifg=#a030a0 guibg=NONE gui=NONE - hi WarningMsg guifg=#b02000 guibg=NONE gui=NONE - hi WildMenu guifg=fg guibg=#d0d090 gui=NONE - hi Folded guifg=NONE guibg=#b0e0b0 gui=NONE - hi FoldColumn guifg=fg guibg=#90e090 gui=NONE - hi DiffAdd guifg=NONE guibg=#b0b0e0 gui=NONE - hi DiffChange guifg=NONE guibg=#e0b0e0 gui=NONE - hi DiffDelete guifg=#002090 guibg=#d0d0d0 gui=NONE - hi DiffText guifg=NONE guibg=#c0e080 gui=NONE - hi SignColumn guifg=fg guibg=#90e090 gui=NONE - - hi IncSearch guifg=#f0f0f0 guibg=#806060 gui=NONE - hi StatusLineNC guifg=fg guibg=#c0c0c0 gui=NONE - hi VertSplit guifg=fg guibg=#c0c0c0 gui=NONE - hi Underlined guifg=#6a5acd guibg=NONE gui=underline - hi Ignore guifg=bg guibg=NONE - " NOTE THIS IS IN THE WARM SECTION - if v:version >= 700 - if has('spell') - hi SpellBad guifg=NONE guibg=NONE guisp=#c03000 - hi SpellCap guifg=NONE guibg=NONE guisp=#2060a8 - hi SpellRare guifg=NONE guibg=NONE guisp=#a030a0 - hi SpellLocal guifg=NONE guibg=NONE guisp=#007068 - endif - hi Pmenu guifg=fg guibg=#e0b0e0 - hi PmenuSel guifg=#f0f0f0 guibg=#806060 gui=NONE - hi PmenuSbar guifg=fg guibg=#c0c0c0 gui=NONE - hi PmenuThumb guifg=fg guibg=#c0e080 gui=NONE - hi TabLine guifg=fg guibg=#c0c0c0 gui=NONE - hi TabLineFill guifg=fg guibg=#c0c0c0 gui=NONE - hi TabLineSel guifg=fg guibg=NONE gui=NONE - hi CursorColumn guifg=NONE guibg=#f0b090 - hi CursorLine guifg=NONE guibg=NONE gui=underline - hi MatchParen guifg=NONE guibg=#c0e080 - endif - - " LIGHT COLOR DEFINE END - - " Vim 7 added stuffs - if v:version >= 700 - hi Ignore gui=NONE - - " the gui=undercurl guisp could only support in Vim 7 - if has('spell') - hi SpellBad gui=undercurl - hi SpellCap gui=undercurl - hi SpellRare gui=undercurl - hi SpellLocal gui=undercurl - endif - hi TabLine gui=underline - hi TabLineFill gui=underline - hi CursorLine gui=underline - endif - - " For reversed stuffs, clear the reversed prop and set the bold prop again - hi IncSearch gui=bold - hi StatusLine gui=bold - hi StatusLineNC gui=bold - hi VertSplit gui=bold - hi Visual gui=bold - - " Enable the bold property - hi Question gui=bold - hi DiffText gui=bold - hi Statement gui=bold - hi Type gui=bold - hi MoreMsg gui=bold - hi ModeMsg gui=bold - hi NonText gui=bold - hi Title gui=bold - hi DiffDelete gui=bold - hi TabLineSel gui=bold - - " gui define for background=light end here - - " generally, a dumb terminal is dark, we assume the light terminal has 256 - " color support. - if &t_Co==8 || &t_Co==16 - set t_Co=256 - endif - if &t_Co==256 - " 256color light terminal support here - - hi Normal ctermfg=16 ctermbg=254 cterm=NONE - " Comment/Uncomment the following line to disable/enable transparency - "hi Normal ctermfg=16 ctermbg=NONE cterm=NONE - hi Search ctermfg=NONE ctermbg=231 cterm=NONE - hi Visual ctermfg=NONE ctermbg=153 cterm=NONE - hi Cursor ctermfg=255 ctermbg=28 cterm=NONE - " hi CursorIM ctermfg=255 ctermbg=90 - hi Special ctermfg=94 ctermbg=NONE cterm=NONE - hi Comment ctermfg=58 ctermbg=NONE cterm=NONE - hi Number ctermfg=94 ctermbg=NONE cterm=NONE - hi Constant ctermfg=23 ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=fg ctermbg=153 cterm=NONE - hi LineNr ctermfg=242 ctermbg=NONE cterm=NONE - hi Question ctermfg=fg ctermbg=186 cterm=NONE - hi PreProc ctermfg=29 ctermbg=NONE cterm=NONE - hi Statement ctermfg=25 ctermbg=NONE cterm=NONE - hi Type ctermfg=25 ctermbg=NONE cterm=NONE - hi Todo ctermfg=88 ctermbg=186 cterm=NONE - " NOTE THIS IS IN THE WARM SECTION - hi Error ctermfg=130 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=133 ctermbg=NONE cterm=NONE - hi ModeMsg ctermfg=fg ctermbg=146 cterm=NONE - hi VisualNOS ctermfg=fg ctermbg=146 cterm=NONE - hi SpecialKey ctermfg=25 ctermbg=NONE cterm=NONE - hi NonText ctermfg=18 ctermbg=252 cterm=NONE - " Comment/Uncomment the following line to disable/enable transparency - "hi NonText ctermfg=18 ctermbg=NONE cterm=NONE - hi Directory ctermfg=133 ctermbg=NONE cterm=NONE - hi ErrorMsg ctermfg=fg ctermbg=216 cterm=NONE - hi MoreMsg ctermfg=64 ctermbg=NONE cterm=NONE - hi Title ctermfg=133 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=124 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=fg ctermbg=186 cterm=NONE - hi Folded ctermfg=NONE ctermbg=151 cterm=NONE - hi FoldColumn ctermfg=fg ctermbg=114 cterm=NONE - hi DiffAdd ctermfg=NONE ctermbg=146 cterm=NONE - hi DiffChange ctermfg=NONE ctermbg=182 cterm=NONE - hi DiffDelete ctermfg=18 ctermbg=252 cterm=NONE - hi DiffText ctermfg=NONE ctermbg=150 cterm=NONE - hi SignColumn ctermfg=fg ctermbg=114 cterm=NONE - - hi IncSearch ctermfg=255 ctermbg=95 cterm=NONE - hi StatusLineNC ctermfg=fg ctermbg=250 cterm=NONE - hi VertSplit ctermfg=fg ctermbg=250 cterm=NONE - hi Underlined ctermfg=62 ctermbg=NONE cterm=underline - hi Ignore ctermfg=bg ctermbg=NONE - " NOTE THIS IS IN THE WARM SECTION - if v:version >= 700 - if has('spell') - if 0 - " ctermsp is not supported in Vim7, we ignore it. - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=130 - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=25 - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=133 - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=23 - else - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE - endif - endif - hi Pmenu ctermfg=fg ctermbg=182 - hi PmenuSel ctermfg=255 ctermbg=95 cterm=NONE - hi PmenuSbar ctermfg=fg ctermbg=250 cterm=NONE - hi PmenuThumb ctermfg=fg ctermbg=150 cterm=NONE - hi TabLine ctermfg=fg ctermbg=250 cterm=NONE - hi TabLineFill ctermfg=fg ctermbg=250 cterm=NONE - hi TabLineSel ctermfg=fg ctermbg=NONE cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=216 - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi MatchParen ctermfg=NONE ctermbg=150 - endif - - hi TabLine cterm=underline - hi TabLineFill cterm=underline - hi CursorLine cterm=underline - - " For reversed stuffs, clear the reversed prop and set the bold prop again - hi IncSearch cterm=bold - hi StatusLine cterm=bold - hi StatusLineNC cterm=bold - hi VertSplit cterm=bold - hi Visual cterm=bold - - hi NonText cterm=bold - hi Question cterm=bold - hi Title cterm=bold - hi DiffDelete cterm=bold - hi DiffText cterm=bold - hi Statement cterm=bold - hi Type cterm=bold - hi MoreMsg cterm=bold - hi ModeMsg cterm=bold - hi TabLineSel cterm=bold - - "hi lCursor ctermfg=bg ctermbg=fg cterm=NONE - endif " t_Co==256 - " }}}2 -elseif &background=='dark' - " for background=dark {{{2 - " DARK COLOR DEFINE START - - hi Normal guifg=#d0d0d0 guibg=#202020 gui=NONE - hi Comment guifg=#d0d090 guibg=NONE gui=NONE - hi Constant guifg=#80c0e0 guibg=NONE gui=NONE - hi Number guifg=#e0c060 guibg=NONE gui=NONE - hi Identifier guifg=#f0c0f0 guibg=NONE gui=NONE - hi Statement guifg=#c0d8f8 guibg=NONE gui=NONE - hi PreProc guifg=#60f080 guibg=NONE gui=NONE - hi Type guifg=#b0d0f0 guibg=NONE gui=NONE - hi Special guifg=#e0c060 guibg=NONE gui=NONE - hi Error guifg=#f08060 guibg=NONE gui=NONE - hi Todo guifg=#800000 guibg=#d0d090 gui=NONE - hi Search guifg=NONE guibg=#800000 gui=NONE - hi Visual guifg=#000000 guibg=#a6caf0 gui=NONE - hi Cursor guifg=#000000 guibg=#00f000 gui=NONE - " NOTE THIS IS IN THE COOL SECTION - " hi CursorIM guifg=#000000 guibg=#f000f0 gui=NONE - hi StatusLine guifg=#000000 guibg=#a6caf0 gui=NONE - hi LineNr guifg=#b0b0b0 guibg=NONE gui=NONE - hi Question guifg=#000000 guibg=#d0d090 gui=NONE - hi ModeMsg guifg=fg guibg=#000080 gui=NONE - hi VisualNOS guifg=fg guibg=#000080 gui=NONE - hi SpecialKey guifg=#b0d0f0 guibg=NONE gui=NONE - hi NonText guifg=#6080f0 guibg=#101010 gui=NONE - hi Directory guifg=#80c0e0 guibg=NONE gui=NONE - hi ErrorMsg guifg=#d0d090 guibg=#800000 gui=NONE - hi MoreMsg guifg=#c0e080 guibg=NONE gui=NONE - hi Title guifg=#f0c0f0 guibg=NONE gui=NONE - hi WarningMsg guifg=#f08060 guibg=NONE gui=NONE - hi WildMenu guifg=#000000 guibg=#d0d090 gui=NONE - hi Folded guifg=NONE guibg=#004000 gui=NONE - hi FoldColumn guifg=#e0e0e0 guibg=#008000 gui=NONE - hi DiffAdd guifg=NONE guibg=#000080 gui=NONE - hi DiffChange guifg=NONE guibg=#800080 gui=NONE - hi DiffDelete guifg=#6080f0 guibg=#202020 gui=NONE - hi DiffText guifg=#000000 guibg=#c0e080 gui=NONE - hi SignColumn guifg=#e0e0e0 guibg=#008000 gui=NONE - hi IncSearch guifg=#000000 guibg=#d0d0d0 gui=NONE - hi StatusLineNC guifg=#000000 guibg=#c0c0c0 gui=NONE - hi VertSplit guifg=#000000 guibg=#c0c0c0 gui=NONE - hi Underlined guifg=#80a0ff guibg=NONE gui=underline - hi Ignore guifg=#000000 guibg=NONE - " NOTE THIS IS IN THE COOL SECTION - if v:version >= 700 - if has('spell') - " the guisp= could only support in Vim 7 - hi SpellBad guifg=NONE guibg=NONE guisp=#f08060 - hi SpellCap guifg=NONE guibg=NONE guisp=#6080f0 - hi SpellRare guifg=NONE guibg=NONE guisp=#f0c0f0 - hi SpellLocal guifg=NONE guibg=NONE guisp=#c0d8f8 - endif - hi Pmenu guifg=fg guibg=#800080 - hi PmenuSel guifg=#000000 guibg=#d0d0d0 gui=NONE - hi PmenuSbar guifg=fg guibg=#000080 gui=NONE - hi PmenuThumb guifg=fg guibg=#008000 gui=NONE - hi TabLine guifg=fg guibg=#008000 gui=NONE - hi TabLineFill guifg=fg guibg=#008000 gui=NONE - hi TabLineSel guifg=fg guibg=NONE gui=NONE - hi CursorColumn guifg=NONE guibg=#800000 gui=NONE - hi CursorLine guifg=NONE guibg=NONE gui=underline - hi MatchParen guifg=NONE guibg=#800080 - endif - - " DARK COLOR DEFINE END - - " Vim 7 added stuffs - if v:version >= 700 - hi Ignore gui=NONE - - " the gui=undercurl could only support in Vim 7 - if has('spell') - hi SpellBad gui=undercurl - hi SpellCap gui=undercurl - hi SpellRare gui=undercurl - hi SpellLocal gui=undercurl - endif - hi TabLine gui=underline - hi TabLineFill gui=underline - hi Underlined gui=underline - hi CursorLine gui=underline - endif - - " gui define for background=dark end here - - if &t_Co==8 || &t_Co==16 - " for 8-color and 16-color term - hi Normal ctermfg=LightGrey ctermbg=Black - hi Special ctermfg=Yellow ctermbg=bg - hi Comment ctermfg=DarkYellow ctermbg=bg - hi Constant ctermfg=Blue ctermbg=bg - hi Number ctermfg=Yellow ctermbg=bg - hi LineNr ctermfg=DarkGrey ctermbg=bg - hi PreProc ctermfg=Green ctermbg=bg - hi Statement ctermfg=Cyan ctermbg=bg - hi Type ctermfg=Cyan ctermbg=bg - hi Error ctermfg=Red ctermbg=bg - hi Identifier ctermfg=Magenta ctermbg=bg - hi SpecialKey ctermfg=Cyan ctermbg=bg - hi NonText ctermfg=Blue ctermbg=bg - hi Directory ctermfg=Blue ctermbg=bg - hi MoreMsg ctermfg=Green ctermbg=bg - hi Title ctermfg=Magenta ctermbg=bg - hi WarningMsg ctermfg=Red ctermbg=bg - hi DiffDelete ctermfg=Blue ctermbg=bg - - hi Search ctermfg=NONE ctermbg=DarkRed - hi Visual ctermfg=Black ctermbg=DarkCyan - hi Cursor ctermfg=Black ctermbg=Green - hi StatusLine ctermfg=Black ctermbg=DarkCyan - hi Question ctermfg=Black ctermbg=DarkYellow - hi Todo ctermfg=DarkRed ctermbg=DarkYellow - hi Folded ctermfg=White ctermbg=DarkGreen - hi ModeMsg ctermfg=Grey ctermbg=DarkBlue - hi VisualNOS ctermfg=Grey ctermbg=DarkBlue - hi ErrorMsg ctermfg=DarkYellow ctermbg=DarkRed - hi WildMenu ctermfg=Black ctermbg=DarkYellow - hi FoldColumn ctermfg=White ctermbg=DarkGreen - hi SignColumn ctermfg=White ctermbg=DarkGreen - hi DiffText ctermfg=Black ctermbg=DarkYellow - - if v:version >= 700 - if has('spell') - hi SpellBad ctermfg=NONE ctermbg=DarkRed - hi SpellCap ctermfg=NONE ctermbg=DarkBlue - hi SpellRare ctermfg=NONE ctermbg=DarkMagenta - hi SpellLocal ctermfg=NONE ctermbg=DarkGreen - endif - hi Pmenu ctermfg=fg ctermbg=DarkMagenta - hi PmenuSel ctermfg=Black ctermbg=fg - hi PmenuSbar ctermfg=fg ctermbg=DarkBlue - hi PmenuThumb ctermfg=fg ctermbg=DarkGreen - hi TabLine ctermfg=fg ctermbg=DarkGreen cterm=underline - hi TabLineFill ctermfg=fg ctermbg=DarkGreen cterm=underline - hi CursorColumn ctermfg=NONE ctermbg=DarkRed - - hi TabLineSel ctermfg=fg ctermbg=bg - hi CursorLine ctermfg=NONE ctermbg=bg cterm=underline - - hi MatchParen ctermfg=NONE ctermbg=DarkMagenta - endif - if &t_Co==8 - " 8 colour terminal support, this assumes 16 colour is available through - " setting the 'bold' attribute, will get bright foreground colour. - " However, the bright background color is not available for 8-color terms. - " - " You can manually set t_Co=16 in your .vimrc to see if your terminal - " supports 16 colours, - hi DiffText cterm=none - hi Visual cterm=none - hi Cursor cterm=none - hi Comment cterm=none - hi Todo cterm=none - hi StatusLine cterm=none - hi Question cterm=none - hi DiffChange cterm=none - hi ModeMsg cterm=none - hi VisualNOS cterm=none - hi ErrorMsg cterm=none - hi WildMenu cterm=none - hi DiffAdd cterm=none - hi Folded cterm=none - hi DiffDelete cterm=none - hi Normal cterm=none - hi PmenuThumb cterm=none - hi Search cterm=bold - hi Special cterm=bold - hi Constant cterm=bold - hi Number cterm=bold - hi LineNr cterm=bold - hi PreProc cterm=bold - hi Statement cterm=bold - hi Type cterm=bold - hi Error cterm=bold - hi Identifier cterm=bold - hi SpecialKey cterm=bold - hi NonText cterm=bold - hi MoreMsg cterm=bold - hi Title cterm=bold - hi WarningMsg cterm=bold - hi FoldColumn cterm=bold - hi SignColumn cterm=bold - hi Directory cterm=bold - hi DiffDelete cterm=bold - else - " Background > 7 is only available with 16 or more colors - - hi WarningMsg cterm=none - hi Search cterm=none - hi Visual cterm=none - hi Cursor cterm=none - hi Special cterm=none - hi Comment cterm=none - hi Constant cterm=none - hi Number cterm=none - hi LineNr cterm=none - hi PreProc cterm=none - hi Todo cterm=none - hi Error cterm=none - hi Identifier cterm=none - hi Folded cterm=none - hi SpecialKey cterm=none - hi Directory cterm=none - hi ErrorMsg cterm=none - hi Normal cterm=none - hi PmenuThumb cterm=none - hi WildMenu cterm=none - hi FoldColumn cterm=none - hi SignColumn cterm=none - hi DiffAdd cterm=none - hi DiffChange cterm=none - hi Question cterm=none - hi StatusLine cterm=none - hi DiffText cterm=none - hi IncSearch cterm=reverse - hi StatusLineNC cterm=reverse - hi VertSplit cterm=reverse - - " Well, well, bold font with color 0-7 is not possible. - " So, the Question, StatusLine, DiffText cannot act as expected. - - hi Statement cterm=none - hi Type cterm=none - hi MoreMsg cterm=none - hi ModeMsg cterm=none - hi NonText cterm=none - hi Title cterm=none - hi VisualNOS cterm=none - hi DiffDelete cterm=none - hi TabLineSel cterm=none - - endif - elseif &t_Co==256 - " 256color dark terminal support here - hi Normal ctermfg=252 ctermbg=234 cterm=NONE - " Comment/Uncomment the following line to disable/enable transparency - "hi Normal ctermfg=252 ctermbg=NONE cterm=NONE - hi Comment ctermfg=186 ctermbg=NONE cterm=NONE - hi Constant ctermfg=110 ctermbg=NONE cterm=NONE - hi Number ctermfg=179 ctermbg=NONE cterm=NONE - hi Identifier ctermfg=219 ctermbg=NONE cterm=NONE - hi Statement ctermfg=153 ctermbg=NONE cterm=NONE - hi PreProc ctermfg=84 ctermbg=NONE cterm=NONE - hi Type ctermfg=153 ctermbg=NONE cterm=NONE - hi Special ctermfg=179 ctermbg=NONE cterm=NONE - hi Error ctermfg=209 ctermbg=NONE cterm=NONE - hi Todo ctermfg=88 ctermbg=186 cterm=NONE - hi Search ctermfg=NONE ctermbg=88 cterm=NONE - hi Visual ctermfg=16 ctermbg=153 cterm=NONE - hi Cursor ctermfg=16 ctermbg=46 cterm=NONE - " NOTE THIS IS IN THE COOL SECTION - " hi CursorIM ctermfg=16 ctermbg=201 cterm=NONE - hi StatusLine ctermfg=16 ctermbg=153 cterm=NONE - hi LineNr ctermfg=249 ctermbg=NONE cterm=NONE - hi Question ctermfg=16 ctermbg=186 cterm=NONE - hi ModeMsg ctermfg=fg ctermbg=18 cterm=NONE - hi VisualNOS ctermfg=fg ctermbg=18 cterm=NONE - hi SpecialKey ctermfg=153 ctermbg=NONE cterm=NONE - hi NonText ctermfg=69 ctermbg=233 cterm=NONE - " Comment/Uncomment the following line to disable/enable transparency - "hi NonText ctermfg=69 ctermbg=NONE cterm=NONE - hi Directory ctermfg=110 ctermbg=NONE cterm=NONE - hi ErrorMsg ctermfg=186 ctermbg=88 cterm=NONE - hi MoreMsg ctermfg=150 ctermbg=NONE cterm=NONE - hi Title ctermfg=219 ctermbg=NONE cterm=NONE - hi WarningMsg ctermfg=209 ctermbg=NONE cterm=NONE - hi WildMenu ctermfg=16 ctermbg=186 cterm=NONE - hi Folded ctermfg=NONE ctermbg=22 cterm=NONE - hi FoldColumn ctermfg=254 ctermbg=28 cterm=NONE - hi DiffAdd ctermfg=NONE ctermbg=18 cterm=NONE - hi DiffChange ctermfg=NONE ctermbg=90 cterm=NONE - hi DiffDelete ctermfg=69 ctermbg=234 cterm=NONE - hi DiffText ctermfg=16 ctermbg=150 cterm=NONE - hi SignColumn ctermfg=254 ctermbg=28 cterm=NONE - hi IncSearch ctermfg=16 ctermbg=252 cterm=NONE - hi StatusLineNC ctermfg=16 ctermbg=250 cterm=NONE - hi VertSplit ctermfg=16 ctermbg=250 cterm=NONE - hi Underlined ctermfg=111 ctermbg=NONE cterm=underline - hi Ignore ctermfg=16 ctermbg=NONE - " NOTE THIS IS IN THE COOL SECTION - if v:version >= 700 - if has('spell') - " the ctermsp= is not supported in Vim 7 we simply ignored - if 0 - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=209 - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=69 - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=219 - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=153 - else - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE - endif - endif - hi Pmenu ctermfg=fg ctermbg=90 - hi PmenuSel ctermfg=16 ctermbg=252 cterm=NONE - hi PmenuSbar ctermfg=fg ctermbg=18 cterm=NONE - hi PmenuThumb ctermfg=fg ctermbg=28 cterm=NONE - hi TabLine ctermfg=fg ctermbg=28 cterm=NONE - hi TabLineFill ctermfg=fg ctermbg=28 cterm=NONE - hi TabLineSel ctermfg=fg ctermbg=NONE cterm=NONE - hi CursorColumn ctermfg=NONE ctermbg=88 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline - hi MatchParen ctermfg=NONE ctermbg=90 - hi TabLine cterm=underline - hi TabLineFill cterm=underline - hi Underlined cterm=underline - hi CursorLine cterm=underline - endif - - endif " t_Co - - " }}}2 -endif - -" Links: -" -" COLOR LINKS DEFINE START - -hi link String Constant -" Character must be different from strings because in many languages -" (especially C, C++) a 'char' variable is scalar while 'string' is pointer, -" mistaken a 'char' for a 'string' will cause disaster! -hi link Character Number -hi link SpecialChar LineNr -hi link Tag Identifier -hi link cCppOut LineNr -" The following are not standard hi links, -" these are used by DrChip -hi link Warning MoreMsg -hi link Notice Constant -" these are used by Calendar -hi link CalToday PreProc -" these are used by TagList -hi link MyTagListTagName IncSearch -hi link MyTagListTagScope Constant - -" COLOR LINKS DEFINE END - -" vim:et:nosta:sw=2:ts=8: -" vim600:fdm=marker:fdl=1: diff --git a/pack/local/opt/railscasts/colors/railscasts.vim b/pack/local/opt/railscasts/colors/railscasts.vim deleted file mode 100644 index 2055b41..0000000 --- a/pack/local/opt/railscasts/colors/railscasts.vim +++ /dev/null @@ -1,96 +0,0 @@ -" Vim color scheme -" -" Name: railscasts.vim -" Maintainer: Nick Moffitt -" Last Change: 01 Mar 2008 -" License: WTFPL -" Version: 2.1 -" -" This theme is based on Josh O'Rourke's Vim clone of the railscast -" textmate theme. The key thing I have done here is supply 256-color -" terminal equivalents for as many of the colors as possible, and fixed -" up some of the funny behaviors for editing e-mails and such. -" -" To use for gvim: -" 1: install this file as ~/.vim/colors/railscasts.vim -" 2: put "colorscheme railscasts" in your .gvimrc -" -" If you are using Ubuntu, you can get the benefit of this in your -" terminals using ordinary vim by taking the following steps: -" -" 1: sudo apt-get install ncurses-term -" 2: put the following in your .vimrc -" if $COLORTERM == 'gnome-terminal' -" set term=gnome-256color -" colorscheme railscasts -" else -" colorscheme default -" endif -" 3: if you wish to use this with screen, add the following to your .screenrc: -" attrcolor b ".I" -" termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm' -" defbce "on" -" term screen-256color-bce - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "railscasts" - -hi link htmlTag xmlTag -hi link htmlTagName xmlTagName -hi link htmlEndTag xmlEndTag - -highlight Normal guifg=#E6E1DC guibg=#111111 -highlight Cursor guifg=#000000 ctermfg=0 guibg=#FFFFFF ctermbg=15 -highlight CursorLine guibg=#000000 ctermbg=233 cterm=NONE - -highlight Comment guifg=#BC9458 ctermfg=180 gui=italic -highlight Constant guifg=#6D9CBE ctermfg=73 -highlight Define guifg=#CC7833 ctermfg=173 -highlight Error guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88 -highlight Function guifg=#FFC66D ctermfg=221 gui=NONE cterm=NONE -highlight Identifier guifg=#6D9CBE ctermfg=73 gui=NONE cterm=NONE -highlight Include guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE -highlight PreCondit guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE -highlight Keyword guifg=#CC7833 ctermfg=173 cterm=NONE -highlight LineNr guifg=#2B2B2B ctermfg=159 guibg=#C0C0FF -highlight Number guifg=#A5C261 ctermfg=107 -highlight PreProc guifg=#E6E1DC ctermfg=103 -highlight Search guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline -highlight Statement guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE -highlight String guifg=#A5C261 ctermfg=107 -highlight Title guifg=#FFFFFF ctermfg=15 -highlight Type guifg=#DA4939 ctermfg=167 gui=NONE cterm=NONE -highlight Visual guibg=#5A647E ctermbg=60 - -highlight DiffAdd guifg=#E6E1DC ctermfg=7 guibg=#519F50 ctermbg=71 -highlight DiffDelete guifg=#E6E1DC ctermfg=7 guibg=#660000 ctermbg=52 -highlight Special guifg=#DA4939 ctermfg=167 - -highlight pythonBuiltin guifg=#6D9CBE ctermfg=73 gui=NONE cterm=NONE -highlight rubyBlockParameter guifg=#FFFFFF ctermfg=15 -highlight rubyClass guifg=#FFFFFF ctermfg=15 -highlight rubyConstant guifg=#DA4939 ctermfg=167 -highlight rubyInstanceVariable guifg=#D0D0FF ctermfg=189 -highlight rubyInterpolation guifg=#519F50 ctermfg=107 -highlight rubyLocalVariableOrMethod guifg=#D0D0FF ctermfg=189 -highlight rubyPredefinedConstant guifg=#DA4939 ctermfg=167 -highlight rubyPseudoVariable guifg=#FFC66D ctermfg=221 -highlight rubyStringDelimiter guifg=#A5C261 ctermfg=143 - -highlight xmlTag guifg=#E8BF6A ctermfg=179 -highlight xmlTagName guifg=#E8BF6A ctermfg=179 -highlight xmlEndTag guifg=#E8BF6A ctermfg=179 - -highlight mailSubject guifg=#A5C261 ctermfg=107 -highlight mailHeaderKey guifg=#FFC66D ctermfg=221 -highlight mailEmail guifg=#A5C261 ctermfg=107 gui=italic cterm=underline - -highlight SpellBad guifg=#D70000 ctermfg=160 ctermbg=NONE cterm=underline -highlight SpellRare guifg=#D75F87 ctermfg=168 guibg=NONE ctermbg=NONE gui=underline cterm=underline -highlight SpellCap guifg=#D0D0FF ctermfg=189 guibg=NONE ctermbg=NONE gui=underline cterm=underline -highlight MatchParen guifg=#FFFFFF ctermfg=15 guibg=#005f5f ctermbg=23 diff --git a/pack/local/opt/solarized/colors/solarized.vim b/pack/local/opt/solarized/colors/solarized.vim deleted file mode 100644 index ee46b17..0000000 --- a/pack/local/opt/solarized/colors/solarized.vim +++ /dev/null @@ -1,969 +0,0 @@ -" Name: Solarized vim colorscheme -" Author: Ethan Schoonover -" URL: http://ethanschoonover.com/solarized -" (see this url for latest release & screenshots) -" License: OSI approved MIT license (see end of this file) -" Created: In the middle of the night -" Modified: 2011 Apr 14 -" -" Usage "{{{ -" -" --------------------------------------------------------------------- -" ABOUT: -" --------------------------------------------------------------------- -" Solarized is a carefully designed selective contrast colorscheme with dual -" light and dark modes that runs in both GUI, 256 and 16 color modes. -" -" See the homepage above for screenshots and details. -" -" --------------------------------------------------------------------- -" INSTALLATION: -" --------------------------------------------------------------------- -" -" Two options for installation: manual or pathogen -" -" MANUAL INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Put the files in the right place! -" 2. Move `solarized.vim` to your `.vim/colors` directory. -" -" RECOMMENDED PATHOGEN INSTALLATION OPTION: -" --------------------------------------------------------------------- -" -" 1. Download and install Tim Pope's Pathogen from: -" https://github.com/tpope/vim-pathogen -" -" 2. Next, move or clone the `vim-colors-solarized` directory so that it is -" a subdirectory of the `.vim/bundle` directory. -" -" a. **clone with git:** -" -" $ cd ~/.vim/bundle -" $ git clone git://github.com/altercation/vim-colors-solarized.git -" -" b. **or move manually into the pathogen bundle directory:** -" In the parent directory of vim-colors-solarized: -" -" $ mv vim-colors-solarized ~/.vim/bundle/ -" -" MODIFY VIMRC: -" -" After either Option 1 or Option 2 above, put the following two lines in your -" .vimrc: -" -" syntax enable -" set background=dark -" colorscheme solarized -" -" or, for the light background mode of Solarized: -" -" syntax enable -" set background=light -" colorscheme solarized -" -" I like to have a different background in GUI and terminal modes, so I can use -" the following if-then. However, I find vim's background autodetection to be -" pretty good and, at least with MacVim, I can leave this background value -" assignment out entirely and get the same results. -" -" if has('gui_running') -" set background=light -" else -" set background=dark -" endif -" -" See the Solarized homepage at http://ethanschoonover.com/solarized for -" screenshots which will help you select either the light or dark background. -" -" Other options are detailed below. -" -" IMPORTANT NOTE FOR TERMINAL USERS: -" -" If you are going to use Solarized in Terminal mode (i.e. not in a GUI version -" like gvim or macvim), **please please please** consider setting your terminal -" emulator's colorscheme to used the Solarized palette. I've included palettes -" for some popular terminal emulator as well as Xdefaults in the official -" Solarized download available from [Solarized homepage]. If you use -" Solarized *without* these colors, Solarized will need to be told to degrade -" its colorscheme to a set compatible with the limited 256 terminal palette -" (whereas by using the terminal's 16 ansi color values, you can set the -" correct, specific values for the Solarized palette). -" -" If you do use the custom terminal colors, solarized.vim should work out of -" the box for you. If you are using a terminal emulator that supports 256 -" colors and don't want to use the custom Solarized terminal colors, you will -" need to use the degraded 256 colorscheme. To do so, simply add the following -" line *before* the `colorschem solarized` line: -" -" let g:solarized_termcolors=256 -" -" Again, I recommend just changing your terminal colors to Solarized values -" either manually or via one of the many terminal schemes available for import. -" -" --------------------------------------------------------------------- -" TOGGLE BACKGROUND FUNCTION: -" --------------------------------------------------------------------- -" -" Solarized comes with a Toggle Background plugin that by default will map to -" if that mapping is available. If it is not available you will need to -" either map the function manually or change your current mapping to -" something else. If you wish to map the function manually, enter the following -" lines in your .vimrc: -" -" nmap ToggleBackground -" imap ToggleBackground -" vmap ToggleBackground -" -" Note that it is important to *not* use the noremap map variants. The plugin -" uses noremap internally. You may run `:help togglebg` for more information. -" -" --------------------------------------------------------------------- -" OPTIONS -" --------------------------------------------------------------------- -" -" Set these in your vimrc file prior to calling the colorscheme. -" -" option name default optional -" ------------------------------------------------ -" g:solarized_termcolors= 16 | 256 -" g:solarized_termtrans = 0 | 1 -" g:solarized_degrade = 0 | 1 -" g:solarized_bold = 1 | 0 -" g:solarized_underline = 1 | 0 -" g:solarized_italic = 1 | 0 -" g:solarized_contrast = "normal"| "high" or "low" -" g:solarized_visibility= "normal"| "high" or "low" -" ------------------------------------------------ -" -" OPTION DETAILS -" -" ------------------------------------------------ -" g:solarized_termcolors= 256 | 16 -" ------------------------------------------------ -" The most important option if you are using vim in terminal (non gui) mode! -" This tells Solarized to use the 256 degraded color mode if running in a 256 -" color capable terminal. Otherwise, if set to `16` it will use the terminal -" emulators colorscheme (best option as long as you've set the emulators colors -" to the Solarized palette). -" -" If you are going to use Solarized in Terminal mode (i.e. not in a GUI -" version like gvim or macvim), **please please please** consider setting your -" terminal emulator's colorscheme to used the Solarized palette. I've included -" palettes for some popular terminal emulator as well as Xdefaults in the -" official Solarized download available from: -" http://ethanschoonover.com/solarized . If you use Solarized without these -" colors, Solarized will by default use an approximate set of 256 colors. It -" isn't bad looking and has been extensively tweaked, but it's still not quite -" the real thing. -" -" ------------------------------------------------ -" g:solarized_termtrans = 0 | 1 -" ------------------------------------------------ -" If you use a terminal emulator with a transparent background and Solarized -" isn't displaying the background color transparently, set this to 1 and -" Solarized will use the default (transparent) background of the terminal -" emulator. *urxvt* required this in my testing; iTerm2 did not. -" -" Note that on Mac OS X Terminal.app, solarized_termtrans is set to 1 by -" default as this is almost always the best option. The only exception to this -" is if the working terminfo file supports 256 colors (xterm-256color). -" -" ------------------------------------------------ -" g:solarized_degrade = 0 | 1 -" ------------------------------------------------ -" For test purposes only; forces Solarized to use the 256 degraded color mode -" to test the approximate color values for accuracy. -" -" ------------------------------------------------ -" g:solarized_bold = 1 | 0 -" ------------------------------------------------ -" ------------------------------------------------ -" g:solarized_underline = 1 | 0 -" ------------------------------------------------ -" ------------------------------------------------ -" g:solarized_italic = 1 | 0 -" ------------------------------------------------ -" If you wish to stop Solarized from displaying bold, underlined or -" italicized typefaces, simply assign a zero value to the appropriate -" variable, for example: `let g:solarized_italic=0` -" -" ------------------------------------------------ -" g:solarized_contrast = "normal"| "high" or "low" -" ------------------------------------------------ -" Stick with normal! It's been carefully tested. Setting this option to high -" or low does use the same Solarized palette but simply shifts some values up -" or down in order to expand or compress the tonal range displayed. -" -" ------------------------------------------------ -" g:solarized_visibility = "normal"| "high" or "low" -" ------------------------------------------------ -" Special characters such as trailing whitespace, tabs, newlines, when -" displayed using ":set list" can be set to one of three levels depending on -" your needs. -" -" --------------------------------------------------------------------- -" COLOR VALUES -" --------------------------------------------------------------------- -" Download palettes and files from: http://ethanschoonover.com/solarized -" -" L\*a\*b values are canonical (White D65, Reference D50), other values are -" matched in sRGB space. -" -" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB -" --------- ------- ---- ------- ----------- ---------- ----------- ----------- -" base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 -" base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 -" base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46 -" base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51 -" base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 -" base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 -" base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93 -" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 -" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 -" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -" red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 -" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 -" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 -" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 -" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 -" green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 -" -" --------------------------------------------------------------------- -" COLORSCHEME HACKING -" --------------------------------------------------------------------- -" -" Useful commands for testing colorschemes: -" :source $VIMRUNTIME/syntax/hitest.vim -" :help highlight-groups -" :help cterm-colors -" :help group-name -" -" Useful links for developing colorschemes: -" http://www.vim.org/scripts/script.php?script_id=2937 -" http://vimcasts.org/episodes/creating-colorschemes-for-vim/ -" http://www.frexx.de/xterm-256-notes/" -" -" -" }}} -" Default option values"{{{ -" --------------------------------------------------------------------- -if !exists("g:solarized_termtrans") - if ($TERM_PROGRAM ==? "apple_terminal" && &t_Co < 256) - let g:solarized_termtrans = 1 - else - let g:solarized_termtrans = 0 - endif -endif -if !exists("g:solarized_degrade") - let g:solarized_degrade = 0 -endif -if !exists("g:solarized_bold") - let g:solarized_bold = 1 -endif -if !exists("g:solarized_underline") - let g:solarized_underline = 1 -endif -if !exists("g:solarized_italic") - let g:solarized_italic = 1 -endif -if !exists("g:solarized_termcolors") - let g:solarized_termcolors = 16 -endif -if !exists("g:solarized_contrast") - let g:solarized_contrast = "normal" -endif -if !exists("g:solarized_visibility") - let g:solarized_visibility = "normal" -endif -"}}} -" Colorscheme initialization "{{{ -" --------------------------------------------------------------------- -hi clear -if exists("syntax_on") - syntax reset -endif -let colors_name = "solarized" - -"}}} -" GUI & CSApprox hexadecimal palettes"{{{ -" --------------------------------------------------------------------- -" -" Set both gui and terminal color values in separate conditional statements -" Due to possibility that CSApprox is running (though I suppose we could just -" leave the hex values out entirely in that case and include only cterm colors) -" We also check to see if user has set solarized (force use of the -" neutral gray monotone palette component) -if (has("gui_running") && g:solarized_degrade == 0) - let s:vmode = "gui" - let s:base03 = "#002b36" - let s:base02 = "#073642" - let s:base01 = "#586e75" - let s:base00 = "#657b83" - let s:base0 = "#839496" - let s:base1 = "#93a1a1" - let s:base2 = "#eee8d5" - let s:base3 = "#fdf6e3" - let s:yellow = "#b58900" - let s:orange = "#cb4b16" - let s:red = "#dc322f" - let s:magenta = "#d33682" - let s:violet = "#6c71c4" - let s:blue = "#268bd2" - let s:cyan = "#2aa198" - let s:green = "#859900" -elseif (has("gui_running") && g:solarized_degrade == 1) - " These colors are identical to the 256 color mode. They may be viewed - " while in gui mode via "let g:solarized_degrade=1", though this is not - " recommened and is for testing only. - let s:vmode = "gui" - let s:base03 = "#1c1c1c" - let s:base02 = "#262626" - let s:base01 = "#4e4e4e" - let s:base00 = "#585858" - let s:base0 = "#808080" - let s:base1 = "#8a8a8a" - let s:base2 = "#d7d7af" - let s:base3 = "#ffffd7" - let s:yellow = "#af8700" - let s:orange = "#d75f00" - let s:red = "#af0000" - let s:magenta = "#af005f" - let s:violet = "#5f5faf" - let s:blue = "#0087ff" - let s:cyan = "#00afaf" - let s:green = "#5f8700" -elseif g:solarized_termcolors != 256 && &t_Co >= 16 - let s:vmode = "cterm" - let s:base03 = "8" - let s:base02 = "0" - let s:base01 = "10" - let s:base00 = "11" - let s:base0 = "12" - let s:base1 = "14" - let s:base2 = "7" - let s:base3 = "15" - let s:yellow = "3" - let s:orange = "9" - let s:red = "1" - let s:magenta = "5" - let s:violet = "13" - let s:blue = "4" - let s:cyan = "6" - let s:green = "2" -elseif g:solarized_termcolors == 256 - let s:vmode = "cterm" - let s:base03 = "234" - let s:base02 = "235" - let s:base01 = "239" - let s:base00 = "240" - let s:base0 = "244" - let s:base1 = "245" - let s:base2 = "187" - let s:base3 = "230" - let s:yellow = "136" - let s:orange = "166" - let s:red = "124" - let s:magenta = "125" - let s:violet = "61" - let s:blue = "33" - let s:cyan = "37" - let s:green = "64" -else - let s:vmode = "cterm" - let s:bright = "* term=bold cterm=bold" - let s:base03 = "0".s:bright - let s:base02 = "0" - let s:base01 = "2".s:bright - let s:base00 = "3".s:bright - let s:base0 = "4".s:bright - let s:base1 = "6".s:bright - let s:base2 = "7" - let s:base3 = "7".s:bright - let s:yellow = "3" - let s:orange = "1".s:bright - let s:red = "1" - let s:magenta = "5" - let s:violet = "13" - let s:blue = "4" - let s:cyan = "6" - let s:green = "2" -endif -"}}} -" Formatting options and null values for passthrough effect "{{{ -" --------------------------------------------------------------------- - let s:none = "NONE" - let s:none = "NONE" - let s:t_none = "NONE" - let s:n = "NONE" - let s:c = ",undercurl" - let s:r = ",reverse" - let s:s = ",standout" - let s:ou = "" - let s:ob = "" -"}}} -" Background value based on termtrans setting "{{{ -" --------------------------------------------------------------------- -if (has("gui_running") || g:solarized_termtrans == 0) - let s:back = s:base03 -else - let s:back = "NONE" -endif -"}}} -" Alternate light scheme "{{{ -" --------------------------------------------------------------------- -if &background == "light" - let s:temp03 = s:base03 - let s:temp02 = s:base02 - let s:temp01 = s:base01 - let s:temp00 = s:base00 - let s:base03 = s:base3 - let s:base02 = s:base2 - let s:base01 = s:base1 - let s:base00 = s:base0 - let s:base0 = s:temp00 - let s:base1 = s:temp01 - let s:base2 = s:temp02 - let s:base3 = s:temp03 - if (s:back != "NONE") - let s:back = s:base03 - endif -endif -"}}} -" Optional contrast schemes "{{{ -" --------------------------------------------------------------------- -if g:solarized_contrast == "high" - let s:base01 = s:base00 - let s:base00 = s:base0 - let s:base0 = s:base1 - let s:base1 = s:base2 - let s:base2 = s:base3 - let s:back = s:back -endif -if g:solarized_contrast == "low" - let s:back = s:base02 - let s:ou = ",underline" -endif -"}}} -" Overrides dependent on user specified values"{{{ -" --------------------------------------------------------------------- -if g:solarized_bold == 1 - let s:b = ",bold" -else - let s:b = "" -endif - -if g:solarized_underline == 1 - let s:u = ",underline" -else - let s:u = "" -endif - -if g:solarized_italic == 1 - let s:i = ",italic" -else - let s:i = "" -endif -"}}} -" Highlighting primitives"{{{ -" --------------------------------------------------------------------- - -exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'" -exe "let s:bg_back = ' ".s:vmode."bg=".s:back ."'" -exe "let s:bg_base03 = ' ".s:vmode."bg=".s:base03 ."'" -exe "let s:bg_base02 = ' ".s:vmode."bg=".s:base02 ."'" -exe "let s:bg_base01 = ' ".s:vmode."bg=".s:base01 ."'" -exe "let s:bg_base00 = ' ".s:vmode."bg=".s:base00 ."'" -exe "let s:bg_base0 = ' ".s:vmode."bg=".s:base0 ."'" -exe "let s:bg_base1 = ' ".s:vmode."bg=".s:base1 ."'" -exe "let s:bg_base2 = ' ".s:vmode."bg=".s:base2 ."'" -exe "let s:bg_base3 = ' ".s:vmode."bg=".s:base3 ."'" -exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'" -exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'" -exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'" -exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'" -exe "let s:bg_magenta = ' ".s:vmode."bg=".s:magenta."'" -exe "let s:bg_violet = ' ".s:vmode."bg=".s:violet ."'" -exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'" -exe "let s:bg_cyan = ' ".s:vmode."bg=".s:cyan ."'" - -exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'" -exe "let s:fg_back = ' ".s:vmode."fg=".s:back ."'" -exe "let s:fg_base03 = ' ".s:vmode."fg=".s:base03 ."'" -exe "let s:fg_base02 = ' ".s:vmode."fg=".s:base02 ."'" -exe "let s:fg_base01 = ' ".s:vmode."fg=".s:base01 ."'" -exe "let s:fg_base00 = ' ".s:vmode."fg=".s:base00 ."'" -exe "let s:fg_base0 = ' ".s:vmode."fg=".s:base0 ."'" -exe "let s:fg_base1 = ' ".s:vmode."fg=".s:base1 ."'" -exe "let s:fg_base2 = ' ".s:vmode."fg=".s:base2 ."'" -exe "let s:fg_base3 = ' ".s:vmode."fg=".s:base3 ."'" -exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'" -exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'" -exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'" -exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'" -exe "let s:fg_magenta = ' ".s:vmode."fg=".s:magenta."'" -exe "let s:fg_violet = ' ".s:vmode."fg=".s:violet ."'" -exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'" -exe "let s:fg_cyan = ' ".s:vmode."fg=".s:cyan ."'" - -exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE". "'" -exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" -exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b."'" -exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" -exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'" -exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u."'" -exe "let s:fmt_uopt = ' ".s:vmode."=NONE".s:ou. " term=NONE".s:ou."'" -exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c."'" -exe "let s:fmt_ital = ' ".s:vmode."=NONE". " term=NONE". "'" -exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r."'" -exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s."'" - -if has("gui_running") - exe "let s:sp_none = ' guisp=".s:none ."'" - exe "let s:sp_back = ' guisp=".s:back ."'" - exe "let s:sp_base03 = ' guisp=".s:base03 ."'" - exe "let s:sp_base02 = ' guisp=".s:base02 ."'" - exe "let s:sp_base01 = ' guisp=".s:base01 ."'" - exe "let s:sp_base00 = ' guisp=".s:base00 ."'" - exe "let s:sp_base0 = ' guisp=".s:base0 ."'" - exe "let s:sp_base1 = ' guisp=".s:base1 ."'" - exe "let s:sp_base2 = ' guisp=".s:base2 ."'" - exe "let s:sp_base3 = ' guisp=".s:base3 ."'" - exe "let s:sp_green = ' guisp=".s:green ."'" - exe "let s:sp_yellow = ' guisp=".s:yellow ."'" - exe "let s:sp_orange = ' guisp=".s:orange ."'" - exe "let s:sp_red = ' guisp=".s:red ."'" - exe "let s:sp_magenta = ' guisp=".s:magenta."'" - exe "let s:sp_violet = ' guisp=".s:violet ."'" - exe "let s:sp_blue = ' guisp=".s:blue ."'" - exe "let s:sp_cyan = ' guisp=".s:cyan ."'" -else - let s:sp_none = "" - let s:sp_back = "" - let s:sp_base03 = "" - let s:sp_base02 = "" - let s:sp_base01 = "" - let s:sp_base00 = "" - let s:sp_base0 = "" - let s:sp_base1 = "" - let s:sp_base2 = "" - let s:sp_base3 = "" - let s:sp_green = "" - let s:sp_yellow = "" - let s:sp_orange = "" - let s:sp_red = "" - let s:sp_magenta = "" - let s:sp_violet = "" - let s:sp_blue = "" - let s:sp_cyan = "" -endif - -"}}} -" Basic highlighting"{{{ -" --------------------------------------------------------------------- -" note that link syntax to avoid duplicate configuration doesn't work with the -" exe compiled formats - -exe "hi! Normal" .s:fmt_none .s:fg_base0 .s:bg_back - -exe "hi! Comment" .s:fmt_ital .s:fg_base01 .s:bg_none -" *Comment any comment - -exe "hi! Constant" .s:fmt_none .s:fg_cyan .s:bg_none -" *Constant any constant -" String a string constant: "this is a string" -" Character a character constant: 'c', '\n' -" Number a number constant: 234, 0xff -" Boolean a boolean constant: TRUE, false -" Float a floating point constant: 2.3e10 - -exe "hi! Identifier" .s:fmt_none .s:fg_blue .s:bg_none -" *Identifier any variable name -" Function function name (also: methods for classes) -" -exe "hi! Statement" .s:fmt_none .s:fg_green .s:bg_none -" *Statement any statement -" Conditional if, then, else, endif, switch, etc. -" Repeat for, do, while, etc. -" Label case, default, etc. -" Operator "sizeof", "+", "*", etc. -" Keyword any other keyword -" Exception try, catch, throw - -exe "hi! PreProc" .s:fmt_none .s:fg_orange .s:bg_none -" *PreProc generic Preprocessor -" Include preprocessor #include -" Define preprocessor #define -" Macro same as Define -" PreCondit preprocessor #if, #else, #endif, etc. - -exe "hi! Type" .s:fmt_none .s:fg_yellow .s:bg_none -" *Type int, long, char, etc. -" StorageClass static, register, volatile, etc. -" Structure struct, union, enum, etc. -" Typedef A typedef - -exe "hi! Special" .s:fmt_none .s:fg_red .s:bg_none -" *Special any special symbol -" SpecialChar special character in a constant -" Tag you can use CTRL-] on this -" Delimiter character that needs attention -" SpecialComment special things inside a comment -" Debug debugging statements - -exe "hi! Underlined" .s:fmt_none .s:fg_violet .s:bg_none -" *Underlined text that stands out, HTML links - -exe "hi! Ignore" .s:fmt_none .s:fg_none .s:bg_none -" *Ignore left blank, hidden |hl-Ignore| - -exe "hi! Error" .s:fmt_bold .s:fg_red .s:bg_none -" *Error any erroneous construct - -exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none -" *Todo anything that needs extra attention; mostly the -" keywords TODO FIXME and XXX -" -"}}} -" Extended highlighting "{{{ -" --------------------------------------------------------------------- -if (g:solarized_visibility=="high") - exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_base1 .s:bg_none -elseif (g:solarized_visibility=="low") - exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none -else - exe "hi! SpecialKey" .s:fmt_bold .s:fg_red .s:bg_none - exe "hi! NonText" .s:fmt_bold .s:fg_base01 .s:bg_none -endif -if (has("gui_running")) || &t_Co > 8 - exe "hi! StatusLine" .s:fmt_none .s:fg_base02 .s:bg_base1 - exe "hi! StatusLineNC" .s:fmt_none .s:fg_base02 .s:bg_base00 - "exe "hi! Visual" .s:fmt_stnd .s:fg_none .s:bg_base02 - exe "hi! Visual" .s:fmt_none .s:fg_base03 .s:bg_base01 -else - exe "hi! StatusLine" .s:fmt_none .s:fg_base02 .s:bg_base2 - exe "hi! StatusLineNC" .s:fmt_none .s:fg_base02 .s:bg_base2 - exe "hi! Visual" .s:fmt_none .s:fg_none .s:bg_base2 -endif -exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! IncSearch" .s:fmt_stnd .s:fg_orange .s:bg_none -exe "hi! Search" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02 -exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none -exe "hi! VertSplit" .s:fmt_bold .s:fg_base00 .s:bg_base00 -exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none -exe "hi! VisualNOS" .s:fmt_stnd .s:fg_none .s:bg_base02 -exe "hi! WarningMsg" .s:fmt_bold .s:fg_red .s:bg_none -exe "hi! WildMenu" .s:fmt_none .s:fg_base2 .s:bg_base02 -exe "hi! Folded" .s:fmt_undb .s:fg_base0 .s:bg_base02 .s:sp_base03 -exe "hi! FoldColumn" .s:fmt_bold .s:fg_base0 .s:bg_base02 -exe "hi! DiffAdd" .s:fmt_revr .s:fg_green .s:bg_none -exe "hi! DiffChange" .s:fmt_revr .s:fg_yellow .s:bg_none -exe "hi! DiffDelete" .s:fmt_revr .s:fg_red .s:bg_none -exe "hi! DiffText" .s:fmt_revr .s:fg_blue .s:bg_none -exe "hi! SignColumn" .s:fmt_none .s:fg_base0 .s:bg_base02 -exe "hi! Conceal" .s:fmt_none .s:fg_blue .s:bg_none -exe "hi! SpellBad" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_red -exe "hi! SpellCap" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_violet -exe "hi! SpellRare" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_cyan -exe "hi! SpellLocal" .s:fmt_curl .s:fg_none .s:bg_none .s:sp_yellow -exe "hi! Pmenu" .s:fmt_none .s:fg_base0 .s:bg_base02 -exe "hi! PmenuSel" .s:fmt_none .s:fg_base2 .s:bg_base01 -exe "hi! PmenuSbar" .s:fmt_none .s:fg_base0 .s:bg_base2 -exe "hi! PmenuThumb" .s:fmt_none .s:fg_base03 .s:bg_base0 -exe "hi! TabLine" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! TabLineSel" .s:fmt_undr .s:fg_base2 .s:bg_base01 .s:sp_base0 -exe "hi! TabLineFill" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0 -exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1 -exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02 -exe "hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0 -hi! link lCursor Cursor -exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01 - -"}}} -" vim syntax highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! vimLineComment" . s:fg_base01 .s:bg_none .s:fmt_ital -exe "hi! vimCommentString".s:fg_violet .s:bg_none .s:fmt_none -hi! link vimVar Identifier -hi! link vimFunc Function -hi! link vimUserFunc Function -exe "hi! vimCommand" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! vimCmdSep" . s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! helpExample" . s:fg_base1 .s:bg_none .s:fmt_none -hi! link helpSpecial Special -exe "hi! helpOption" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! helpNote" . s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! helpVim" . s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! helpHyperTextJump" .s:fg_blue .s:bg_none .s:fmt_undr -exe "hi! helpHyperTextEntry".s:fg_green .s:bg_none .s:fmt_none -exe "hi! vimIsCommand" . s:fg_base00 .s:bg_none .s:fmt_none -exe "hi! vimSynMtchOpt" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! vimSynType" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! vimHiLink" . s:fg_blue .s:bg_none .s:fmt_none -exe "hi! vimHiGroup" . s:fg_blue .s:bg_none .s:fmt_none -exe "hi! vimGroup" . s:fg_blue .s:bg_none .s:fmt_undb -"}}} -" html highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! htmlTag" . s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! htmlEndTag" . s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! htmlTagN" . s:fg_base1 .s:bg_none .s:fmt_bold -exe "hi! htmlTagName" . s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! htmlSpecialTagName". s:fg_blue .s:bg_none .s:fmt_ital -exe "hi! htmlArg" . s:fg_base00 .s:bg_none .s:fmt_none -exe "hi! javaScript" . s:fg_yellow .s:bg_none .s:fmt_none -"}}} -" perl highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none -exe "hi! perlVarPlain" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! perlStatementFileDesc". s:fg_cyan.s:bg_back.s:fmt_none - -"}}} -" tex highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! texStatement" . s:fg_cyan .s:bg_back .s:fmt_none -exe "hi! texMathZoneX" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none -exe "hi! texRefLabel" . s:fg_yellow .s:bg_back .s:fmt_none -"}}} -" ruby highlighting "{{{ -" --------------------------------------------------------------------- -exe "hi! rubyDefine" . s:fg_base1 .s:bg_back .s:fmt_bold -"rubyInclude -"rubySharpBang -"rubyAccess -"rubyPredefinedVariable -"rubyBoolean -"rubyClassVariable -"rubyBeginEnd -"rubyRepeatModifier -"hi! link rubyArrayDelimiter Special " [ , , ] -"rubyCurlyBlock { , , } - -"hi! link rubyClass Keyword -"hi! link rubyModule Keyword -"hi! link rubyKeyword Keyword -"hi! link rubyOperator Operator -"hi! link rubyIdentifier Identifier -"hi! link rubyInstanceVariable Identifier -"hi! link rubyGlobalVariable Identifier -"hi! link rubyClassVariable Identifier -"hi! link rubyConstant Type -"}}} -" haskell syntax highlighting"{{{ -" --------------------------------------------------------------------- -" For use with syntax/haskell.vim : Haskell Syntax File -" http://www.vim.org/scripts/script.php?script_id=3034 -" See also Steffen Siering's github repository: -" http://github.com/urso/dotrc/blob/master/vim/syntax/haskell.vim -" --------------------------------------------------------------------- -" -" Treat True and False specially, see the plugin referenced above -let hs_highlight_boolean=1 -" highlight delims, see the plugin referenced above -let hs_highlight_delimiters=1 - -exe "hi! cPreCondit". s:fg_orange.s:bg_none .s:fmt_none - -exe "hi! VarId" . s:fg_blue .s:bg_none .s:fmt_none -exe "hi! ConId" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsImport" . s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! hsString" . s:fg_base00 .s:bg_none .s:fmt_none - -exe "hi! hsStructure" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_hlFunctionName" . s:fg_blue .s:bg_none -exe "hi! hsStatement" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsImportLabel" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hs_OpFunctionName" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hs_DeclareFunction" . s:fg_orange .s:bg_none .s:fmt_none -exe "hi! hsVarSym" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsType" . s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! hsTypedef" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsModuleName" . s:fg_green .s:bg_none .s:fmt_undr -exe "hi! hsModuleStartLabel" . s:fg_magenta.s:bg_none .s:fmt_none -hi! link hsImportParams Delimiter -hi! link hsDelimTypeExport Delimiter -hi! link hsModuleStartLabel hsStructure -hi! link hsModuleWhereLabel hsModuleStartLabel - -" following is for the haskell-conceal plugin -" the first two items don't have an impact, but better safe -exe "hi! hsNiceOperator" . s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! hsniceoperator" . s:fg_cyan .s:bg_none .s:fmt_none - -"}}} -" pandoc markdown syntax highlighting "{{{ -" --------------------------------------------------------------------- - -"PandocHiLink pandocNormalBlock -exe "hi! pandocTitleBlock" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocTitleBlockTitle" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocTitleComment" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocComment" .s:fg_base01 .s:bg_none .s:fmt_ital -exe "hi! pandocVerbatimBlock" .s:fg_yellow .s:bg_none .s:fmt_none -hi! link pandocVerbatimBlockDeep pandocVerbatimBlock -hi! link pandocCodeBlock pandocVerbatimBlock -hi! link pandocCodeBlockDelim pandocVerbatimBlock -exe "hi! pandocBlockQuote" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader1" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader2" .s:fg_cyan .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader3" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader4" .s:fg_red .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader5" .s:fg_base0 .s:bg_none .s:fmt_none -exe "hi! pandocBlockQuoteLeader6" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocListMarker" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr - -" Definitions -" --------------------------------------------------------------------- -let s:fg_pdef = s:fg_violet -exe "hi! pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd -exe "hi! pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutDefinition" .s:fg_pdef .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none -exe "hi! pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none - -" Tables -" --------------------------------------------------------------------- -let s:fg_ptable = s:fg_blue -exe "hi! pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none -hi! link pandocTableStructureTop pandocTableStructre -hi! link pandocTableStructureEnd pandocTableStructre -exe "hi! pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none -exe "hi! pandocTableZebraDark" .s:fg_ptable.s:bg_base02.s:fmt_none -exe "hi! pandocEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeoutTable" .s:fg_ptable.s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInlineTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSuperscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none -exe "hi! pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none - -" Headings -" --------------------------------------------------------------------- -let s:fg_phead = s:fg_orange -exe "hi! pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold -exe "hi! pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocStrongEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasisHeading".s:fg_phead .s:bg_none.s:fmt_bldi -exe "hi! pandocStrikeoutHeading" .s:fg_phead .s:bg_none.s:fmt_revr -exe "hi! pandocVerbatimInlineHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSuperscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold -exe "hi! pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold - -" Links -" --------------------------------------------------------------------- -exe "hi! pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr -exe "hi! pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb -exe "hi! pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr -exe "hi! pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi -exe "hi! pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00 -exe "hi! pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00 -exe "hi! pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb -exe "hi! pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr -exe "hi! pandocFootnoteDefLink" .s:fg_green .s:bg_none .s:fmt_bold -exe "hi! pandocFootnoteInline" .s:fg_green .s:bg_none .s:fmt_undb -exe "hi! pandocFootnote" .s:fg_green .s:bg_none .s:fmt_none -exe "hi! pandocCitationDelim" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitation" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocCitationID" .s:fg_magenta.s:bg_none .s:fmt_undr -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none - -" Main Styles -" --------------------------------------------------------------------- -exe "hi! pandocStyleDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocEmphasis" .s:fg_base0 .s:bg_none .s:fmt_ital -exe "hi! pandocEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bold -exe "hi! pandocStrongEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrongEmphasisEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bldi -exe "hi! pandocStrikeout" .s:fg_base01 .s:bg_none .s:fmt_revr -exe "hi! pandocVerbatimInline" .s:fg_yellow .s:bg_none .s:fmt_none -exe "hi! pandocSuperscript" .s:fg_violet .s:bg_none .s:fmt_none -exe "hi! pandocSubscript" .s:fg_violet .s:bg_none .s:fmt_none - -exe "hi! pandocRule" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocRuleLine" .s:fg_blue .s:bg_none .s:fmt_bold -exe "hi! pandocEscapePair" .s:fg_red .s:bg_none .s:fmt_bold -exe "hi! pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none -exe "hi! pandocNonBreakingSpace" . s:fg_red .s:bg_none .s:fmt_revr -hi! link pandocEscapedCharacter pandocEscapePair -hi! link pandocLineBreak pandocEscapePair - -" Embedded Code -" --------------------------------------------------------------------- -exe "hi! pandocMetadataDelim" .s:fg_base01 .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadataKey" .s:fg_blue .s:bg_none .s:fmt_none -exe "hi! pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_bold -hi! link pandocMetadataTitle pandocMetadata - -"}}} -" Utility autocommand "{{{ -" --------------------------------------------------------------------- -" In cases where Solarized is initialized inside a terminal vim session and -" then transferred to a gui session via the command `:gui`, the gui vim process -" does not re-read the colorscheme (or .vimrc for that matter) so any `has_gui` -" related code that sets gui specific values isn't executed. -" -" Currently, Solarized sets only the cterm or gui values for the colorscheme -" depending on gui or terminal mode. It's possible that, if the following -" autocommand method is deemed excessively poor form, that approach will be -" used again and the autocommand below will be dropped. -" -" However it seems relatively benign in this case to include the autocommand -" here. It fires only in cases where vim is transferring from terminal to gui -" mode (detected with the script scope s:vmode variable). It also allows for -" other potential terminal customizations that might make gui mode suboptimal. -" -autocmd GUIEnter * if (s:vmode != "gui") | exe "colorscheme " . g:colors_name | endif -"}}} -" License "{{{ -" --------------------------------------------------------------------- -" -" Copyright (c) 2011 Ethan Schoonover -" -" Permission is hereby granted, free of charge, to any person obtaining a copy -" of this software and associated documentation files (the "Software"), to deal -" in the Software without restriction, including without limitation the rights -" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -" copies of the Software, and to permit persons to whom the Software is -" furnished to do so, subject to the following conditions: -" -" The above copyright notice and this permission notice shall be included in -" all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -" THE SOFTWARE. -" -" vim:foldmethod=marker:foldlevel=0 -"}}} diff --git a/pack/local/opt/southwest-fog/colors/southwest-fog.vim b/pack/local/opt/southwest-fog/colors/southwest-fog.vim deleted file mode 100644 index 2b47384..0000000 --- a/pack/local/opt/southwest-fog/colors/southwest-fog.vim +++ /dev/null @@ -1,157 +0,0 @@ -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Author: Mario Gutierrez (mario@mgutz.com) -" Last Change: Dececember 6, 2010 -" Version: 0.2 -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set background=dark -hi clear -if exists("syntax_on") - syntax reset -endif -let colors_name = "southwest-fog" - - -"""""""""" General - -hi Normal guifg=#acb9c7 guibg=#26292e gui=none - -if version >= 700 - hi CursorColumn guibg=#30333a - hi CursorLine guibg=#30333a - hi MatchParen guifg=magenta guibg=#1a1d20 gui=bold,italic - hi Pmenu guifg=bg guibg=#957b94 - hi PmenuSel guifg=bg guibg=#a694b3 - - hi IncSearch guifg=bg guibg=#9d94b3 gui=bold - hi Search guifg=bg guibg=#9d94b3 gui=none -endif - -hi Cursor guifg=bg guibg=#73b87f gui=none -hi DiffAdd guifg=bg guibg=#70869d gui=none -hi DiffChange guifg=bg guibg=#a58f73 gui=none -hi DiffDelete guifg=bg guibg=#a27376 gui=none -hi DiffText guifg=bg guibg=#a4a273 gui=none -hi ErrorMsg guifg=fg guibg=#aa2e34 gui=none -hi Folded guifg=fg guibg=#3d4a3e gui=none -hi FoldColumn guifg=#d7969d guibg=#3f4c4d gui=none -hi LineNr guifg=#3d424a guibg=bg gui=none -hi NonText guifg=#3d424a guibg=bg gui=none -hi Question guifg=#6dbb6d guibg=bg gui=none -hi StatusLine guifg=#b0d3bb guibg=#1a1d20 gui=none -hi StatusLineNC guifg=#5a6c60 guibg=#1a1d20 gui=none -hi TabLine guifg=#555555 guibg=#dddddd gui=none -hi TabLineFill guifg=fg guibg=#dddddd gui=none -hi TabLineSel guifg=#101010 guibg=#b0b0b0 gui=none -hi Title guifg=#d7969d guibg=bg gui=none -hi VertSplit guifg=#1a1d20 guibg=#1a1d20 gui=none -hi Visual guifg=bg guibg=#94b3b3 gui=none -hi WarningMsg guifg=#bb6d6d guibg=bg gui=none - - -"""""""""" Syntax highlighting - -hi Comment guifg=#5a6c60 guibg=bg gui=italic -hi Constant guifg=#b1c7ad gui=none -hi Error guifg=fg guibg=#aa2e34 gui=none -hi Function guifg=#cccbb1 gui=none -hi Identifier guifg=#b89e93 gui=none -hi Ignore guifg=bg guibg=bg gui=none -hi Keyword guifg=#ccc0b1 gui=none -hi Number guifg=#e1d4a8 gui=none -hi PreProc guifg=#bbacc7 gui=none -hi Special guifg=#a58f73 gui=none -hi Special guifg=#b8a792 gui=none -hi Statement guifg=#ccc0b1 gui=none -hi String guifg=#9a7bb2 gui=none -hi Todo guifg=#bebb83 guibg=bg gui=bold -hi Type guifg=#cbb0b2 gui=none -hi Underlined guifg=#bea483 gui=underline - - -""""""""""" ERB - -hi link erubyDelimiter PreProc - - -""""""""""" HAML - -hi link hamlAttributes htmlArg -hi link hamlTag htmlTag -hi link hamlTagName htmlTagName -hi link hamlIdChar hamlId -hi link hamlClassChar hamlClass - - -""""""""""" HELP - -hi link helpSectionDelim NonText -hi link helpExample Statement - - -""""""""""" HTML - -hi link htmlTag Statement -hi link htmlEndTag Statement -hi link htmlTagName Statement - - -"""""""""" JavaScript - -hi link javaScriptFunction Statement -hi link javaScriptFuncName Function -hi link javaScriptLabel PreProc - - -"""""""""" MAKE - -hi link makeCommands Statement - - -"""""""""" MARKDOWN (tpope's vim-markdown) - -hi link markdownCodeBlock Statement -hi link markdownCode Statement -hi link markdownCodeDelimiter Statement -hi link markdownHeadingDelimiter Title -hi markdownLinkText guifg=#cbb0b2 gui=underline -hi markdownUrl guifg=#69839a guibg=bg gui=none -hi link markdownLinkTextDelimiter markdownUrl -hi link markdownLinkDelimiter markdownUrl - - -""""""""""" NERDTree - -hi link treePart NonText -hi link treePartFile treePart -hi link treeDirSlash treePart -hi link treeDir Statement -hi link treeClosable PreProc -hi link treeOpenable treeClosable -hi link treeUp treeClosable -hi treeFlag guifg=#3e71a1 guibg=bg gui=none -hi link treeHelp Comment -hi link treeLink Type -hi link treeExecFile Type - - -"""""""""" PHP - -hi link phpVarSelector Identifier - - -"""""""""" Ruby - -hi link rubyAccess PreProc -hi rubyInterpolation guifg=#f6abf1 guibg=bg -hi link rubyInterpolationDelimiter rubyInterpolation -hi link rubyStringDelimiter String - - -""""""""""" XML - -hi link xmlTag htmlTag -hi link xmlEndTag htmlEndTag -hi link xmlTagName htmlTagName - -" vim: set sw=4 sts=4: diff --git a/pack/local/opt/vim-obsidian b/pack/local/opt/vim-obsidian new file mode 160000 index 0000000..e7385ad --- /dev/null +++ b/pack/local/opt/vim-obsidian @@ -0,0 +1 @@ +Subproject commit e7385ad9160077ff191d96bbf40cffcfcbac9027 diff --git a/pack/local/opt/vim-tomorrow-theme b/pack/local/opt/vim-tomorrow-theme new file mode 160000 index 0000000..46994f3 --- /dev/null +++ b/pack/local/opt/vim-tomorrow-theme @@ -0,0 +1 @@ +Subproject commit 46994f3a4d4574ce0d48c26a3bc1e528b8092c93 diff --git a/pack/local/opt/wombat/colors/wombat.vim b/pack/local/opt/wombat/colors/wombat.vim deleted file mode 100644 index 9ad1e56..0000000 --- a/pack/local/opt/wombat/colors/wombat.vim +++ /dev/null @@ -1,51 +0,0 @@ -" Maintainer: Lars H. Nielsen (dengmao@gmail.com) -" Last Change: January 22 2007 - -set background=dark - -hi clear - -if exists("syntax_on") - syntax reset -endif - -let colors_name = "wombat" - - -" Vim >= 7.0 specific colors -if version >= 700 - hi CursorLine guibg=#2d2d2d - hi CursorColumn guibg=#2d2d2d - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold - hi Pmenu guifg=#f6f3e8 guibg=#444444 - hi PmenuSel guifg=#000000 guibg=#cae682 -endif - -" General colors -hi Cursor guifg=NONE guibg=#656565 gui=none -hi Normal guifg=#f6f3e8 guibg=#242424 gui=none -hi NonText guifg=#808080 guibg=#303030 gui=none -hi LineNr guifg=#857b6f guibg=#000000 gui=none -hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic -hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none -hi VertSplit guifg=#444444 guibg=#444444 gui=none -hi Folded guibg=#384048 guifg=#a0a8b0 gui=none -hi Title guifg=#f6f3e8 guibg=NONE gui=bold -hi Visual guifg=#f6f3e8 guibg=#444444 gui=none -hi SpecialKey guifg=#808080 guibg=#343434 gui=none - -" Syntax highlighting -hi Comment guifg=#99968b gui=italic -hi Todo guifg=#8f8f8f gui=italic -hi Constant guifg=#e5786d gui=none -hi String guifg=#95e454 gui=italic -hi Identifier guifg=#cae682 gui=none -hi Function guifg=#cae682 gui=none -hi Type guifg=#cae682 gui=none -hi Statement guifg=#8ac6f2 gui=none -hi Keyword guifg=#8ac6f2 gui=none -hi PreProc guifg=#e5786d gui=none -hi Number guifg=#e5786d gui=none -hi Special guifg=#e7f6da gui=none - - diff --git a/pack/local/opt/wombat256/colors/wombat256.vim b/pack/local/opt/wombat256/colors/wombat256.vim deleted file mode 100644 index 73be6db..0000000 --- a/pack/local/opt/wombat256/colors/wombat256.vim +++ /dev/null @@ -1,302 +0,0 @@ -" Vim color file -" Maintainer: David Liang (bmdavll at gmail dot com) -" Last Change: November 28 2008 -" -" wombat256.vim - a modified version of Wombat by Lars Nielsen that also -" works on xterms with 88 or 256 colors. The algorithm for approximating the -" GUI colors with the xterm palette is from desert256.vim by Henry So Jr. - -set background=dark - -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif - -let g:colors_name = "wombat256" - -if !has("gui_running") && &t_Co != 88 && &t_Co != 256 - finish -endif - -" 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 -fun X(group, fg, bg, attr) - if a:fg != "" - exec "hi ".a:group." guifg=#".a:fg." ctermfg=".rgb(a:fg) - endif - if a:bg != "" - exec "hi ".a:group." guibg=#".a:bg." ctermbg=".rgb(a:bg) - endif - if a:attr != "" - if a:attr == 'italic' - exec "hi ".a:group." gui=".a:attr." cterm=none" - else - exec "hi ".a:group." gui=".a:attr." cterm=".a:attr - endif - endif -endfun -" }}} - -call X("Normal", "cccccc", "242424", "none") -call X("Cursor", "222222", "ecee90", "none") -call X("CursorLine", "", "32322e", "none") -call X("CursorColumn", "", "2d2d2d", "") - "CursorIM - "Question - "IncSearch -call X("Search", "444444", "af87d7", "") -call X("MatchParen", "ecee90", "857b6f", "bold") -call X("SpecialKey", "6c6c6c", "2d2d2d", "none") -call X("Visual", "ecee90", "597418", "none") -call X("LineNr", "857b6f", "121212", "none") -call X("Folded", "a0a8b0", "404048", "none") -call X("Title", "f6f3e8", "", "bold") -call X("VertSplit", "444444", "444444", "none") -call X("StatusLine", "f6f3e8", "444444", "italic") -call X("StatusLineNC", "857b6f", "444444", "none") - "Scrollbar - "Tooltip - "Menu - "WildMenu -call X("Pmenu", "f6f3e8", "444444", "") -call X("PmenuSel", "121212", "caeb82", "") -call X("WarningMsg", "ff0000", "", "") - "ErrorMsg - "ModeMsg - "MoreMsg - "Directory - "DiffAdd - "DiffChange - "DiffDelete - "DiffText - -" syntax highlighting -call X("Number", "e5786d", "", "none") -call X("Constant", "e5786d", "", "none") -call X("String", "95e454", "", "italic") -call X("Comment", "c0bc6c", "", "italic") -call X("Identifier", "caeb82", "", "none") -call X("Keyword", "87afff", "", "none") -call X("Statement", "87afff", "", "none") -call X("Function", "caeb82", "", "none") -call X("PreProc", "e5786d", "", "none") -call X("Type", "caeb82", "", "none") -call X("Special", "ffdead", "", "none") -call X("Todo", "857b6f", "", "italic") - "Underlined - "Error - "Ignore - -hi! link VisualNOS Visual -hi! link NonText LineNr -hi! link FoldColumn Folded - -" 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 -" }}} - -" vim:set ts=4 sw=4 noet fdm=marker: diff --git a/pack/local/start/vim-airline b/pack/local/start/vim-airline index 83bd08a..49cdcb7 160000 --- a/pack/local/start/vim-airline +++ b/pack/local/start/vim-airline @@ -1 +1 @@ -Subproject commit 83bd08a97a0a390aa62d8c36ad208f07f49c7873 +Subproject commit 49cdcb7b3ea76ee19c737885c0ab19e64e564169 diff --git a/vimrc b/vimrc index 340f523..9496f54 100644 --- a/vimrc +++ b/vimrc @@ -16,9 +16,9 @@ set nostartofline set autochdir set nofoldenable -set background=dark +" set background=dark set title -set number +" set number set browsedir=buffer set autochdir @@ -66,7 +66,7 @@ set smarttab set expandtab set softtabstop=2 -" Highlightinh in python: +" Highlightin in python: let python_highlight_numbers = 1 let python_highlight_builtins = 1 let python_highlight_exceptions = 1 @@ -86,47 +86,28 @@ else endif -" """""""" +"""""""""" " NERDTree -" """""""" +"""""""""" let NERDTreeIgnore = ['\.vim$', '\~$', '\.pyc'] let NERDTreeShowBookmarks = 1 let g:NERDTreeGitStatusUseNerdFonts = 1 let g:NERDTreeGitStatusShowClean = 0 let g:NERDTreeCustomOpenArgs={'file':{'where': 't'}} -" Start NERDTree and leave the cursor in it. -autocmd VimEnter * NERDTree | wincmd p -" Start NERDTree when Vim is started without file arguments. -autocmd StdinReadPre * let s:std_in=1 -autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif -" If a file is specified, move the cursor to its window. -autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif -" Start NERDTree when Vim starts with a directory argument. -autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') | - \ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif -" Exit Vim if NERDTree is the only window left. -autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | - \ quit | endif -" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree. -autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 | - \ let buf=bufnr() | buffer# | execute "normal! \w" | execute 'buffer'.buf | endif -" Open the existing NERDTree on each new tab. -autocmd BufWinEnter * silent NERDTreeMirror - nnoremap N :NERDTreeToggle nnoremap n :NERDTreeFocus -" """""""""""""" +"""""""""""""""" " NERD Commenter -" """""""""""""" +"""""""""""""""" let NERDSpaceDelims=1 let NERDCreateDefaultMappings=1 -" """"""""""""""""" +""""""""""""""""""" " Templates -" """"""""""""""""" +""""""""""""""""""" let g:templates_directory=[$HOME.'/.vim/templates', 'templates'] """"""""""""""" @@ -138,13 +119,17 @@ nnoremap tt :below terminal """"""""""""""" " GIT """"""""""""""" -nnoremap gg :GitGutterLineHighlightsToggle -nnoremap gc :GitCommit -nnoremap gs :GitStatus +nnoremap gh :GitGutterLineHighlightsToggle +nnoremap gc :Gcommit -a +nnoremap gs :Gstatus +nnoremap ga :Git add -p +nnoremap gm :Gcommit --amend +nnoremap gp :Gpull +nnoremap gP :Gpush -" """"""""""""""""" +"""""""""""""""""" " Airline customizations -" """"""""""""""""" +"""""""""""""""""" let g:airline#extensions#capslock#enabled = 1 let g:airline#extensions#branch#use_vcscommand = 0 @@ -161,20 +146,15 @@ let g:airline_symbols.paste = 'Þ' let g:airline_symbols.whitespace = 'Ξ' -" """"""""""" +"""""""""""" " Keymappings -" """"""""""" +"""""""""""" nnoremap l :set list! nnoremap f :set fullscreen! nnoremap x :set paste! nnoremap da "_dd -nnoremap ts :ConqueTermSplit zsh -nnoremap tn :ConqueTermTab zsh - -map c NERDCommenterToggle - " diffput/diffget nnoremap dp :diffput nnoremap dg :diffget @@ -211,13 +191,6 @@ vnoremap k " nnoremap :OpenFilemanager nnoremap of :OpenFilemanager -" Conque Term -let g:ConqueTerm_InsertOnEnter = 1 -let g:ConqueTerm_CWInsert = 1 -let g:ConqueTerm_TERM = 'xterm-256color' -let g:ConqueTerm_CloseOnEnd = 1 -let g:ConqueTerm_SendVisKey = ',tp' - " Map Ctrl-T to new tab and Ctrl-W to close tab " Map Ctrl-S to save @@ -270,6 +243,8 @@ if $TERM_PROGRAM == 'iTerm.app' imap [200~ XTermPasteBegin("") endif +colorscheme freya + " User customizations are held in file ~/.vim/vimrc.local if filereadable($HOME."/.vim/vimrc.local") source $HOME/.vim/vimrc.local