diff --git a/.vim/.netrwhist b/.vim/.netrwhist index 86f8c50..e69de29 100644 --- a/.vim/.netrwhist +++ b/.vim/.netrwhist @@ -1,4 +0,0 @@ -let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =2 -let g:netrw_dirhist_1='/home/rharding/configs/pyvim/bundle' -let g:netrw_dirhist_2='/home/rharding/configs/pyvim/.vim.bak' diff --git a/.vim/after/syntax/moin.vim b/.vim/after/syntax/moin.vim new file mode 100644 index 0000000..36df06d --- /dev/null +++ b/.vim/after/syntax/moin.vim @@ -0,0 +1,143 @@ +" Vim syntax file +" Language: MoinMoin +" Maintainer: Michael Lamertz +" Contributors: David O'Callaghan +" Tony Garland +" Ingo Karkat +" Last Change: 27-Jan-2008 +" 27-Jan-2008 Incorporated syntax changes of MoinMoin 1.6; the +" syntax version is configurable via g:moin_version (globally) or +" b:moin_version (for the current buffer only). +" Small BFs: 'elsif', 'did_acedb_...'. +" 22-Aug-2007 Added moinEmbedded highlighting. +" 08-May-2007 Added contains=@NoSpell for URLs, Email, pragmas and +" (configurable via g:moin_spell_wikiwords) WikiWords. + +" Bugs: Parsing of mixed bold-italic not yet implemented +" Tables not yet implemented + +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +function! s:GetMoinVersion() + if exists('b:moin_version') + return b:moin_version + elseif exists('g:moin_version') + return g:moin_version + else + return 999 + endif +endfunction + +" headings +syn match moinHeader /^\(=\{1,5}\).*\1$/ + +" inline markup +syn match moinItalic /\('\{2}\)[^']\+\1/ +syn match moinBold /\('\{3}\)[^']\+\1/ +syn match moinBoldItalic /\('\{5}\)[^']\+\1/ +syn match moinUnderline /\(_\{2}\).\{-}\1/ +syn match moinSubscript /\(,\{2}\).\{-}\1/ +syn match moinSuperscript /\(\^\).\{-}\1/ +syn match moinTypewriter /\(`\).\{-}\1/ +if s:GetMoinVersion() < 160 + syn match moinMacro /\[\{2}.\{-}\]\{2}/ +else + syn match moinMacro /<\{2}.\{-}>\{2}/ +endif + +" Codeblocks +syn region moinPreformatted start=/{{{/ end=/}}}/ + +" Links +if exists('g:moin_spell_wikiwords') + syn match moinWikiWord /\(\w\+:\)\?\u[a-z0-9]\+\u[a-z0-9]\+\(\u[a-z0-9]\+\)*/ + syn match moinSubLink /\(\w\+\|\.\.\)\?\// nextgroup=moinWikiWord +else + syn match moinWikiWord /\(\w\+:\)\?\u[a-z0-9]\+\u[a-z0-9]\+\(\u[a-z0-9]\+\)*/ contains=@NoSpell + syn match moinSubLink /\(\w\+\|\.\.\)\?\// nextgroup=moinWikiWord contains=@NoSpell +endif +syn match moinNormalURL /\w\+:\/\/\S\+/ contains=@NoSpell +syn match moinEmail /\S\+@\S\+/ contains=@NoSpell +if s:GetMoinVersion() < 160 + syn match moinBracketLink /\[[^[\]]\+\]/ contains=@NoSpell + syn match moinEmbedded /attachment:\S\+/ contains=@NoSpell + syn match moinEmbedded /inline:\S\+/ contains=@NoSpell +else + syn match moinBracketLink /\[\{2}.\{-}\]\{2}/ contains=@NoSpell + syn match moinEmbedded /{\{2}[^{].\{-}}\{2}/ contains=@NoSpell +endif + + +" lists +syn match moinBulletList /^\(\s\+\)\zs\*\ze\s/ +syn match moinNumberedList /^\(\s\+\)\zs1\.\ze\s/ +syn match moinAlphalist /^\(\s\+\)\zsa\.\ze\s/ +syn match moinRomanlist /^\(\s\+\)\zsi\.\ze\s/ +syn match moinBigromanlist /^\(\s\+\)\zsI\.\ze\s/ +syn match moinDescriptionlist /^\(\s\+\)\zs.\{-}::\ze\s/ + +" rules +syn match moinRule /^-\{4,}/ + +" comments/pragmas +syn match moinComment /^##.*$/ +syn match moinPragma /^#\w\+.*$/ contains=@NoSpell + +" variables +syn match moinVariable /@\w\+@/ + + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_moin_syn_inits") + if version < 508 + let did_moin_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink moinHeader Function + + HiLink moinItalic Identifier + HiLink moinBold Identifier + HiLink moinBoldItalic Identifier + HiLink moinUnderline Identifier + HiLink moinSubscript Identifier + HiLink moinSuperscript Identifier + HiLink moinTypewriter Identifier + HiLink moinMacro Define + HiLink moinPragma Define + HiLink moinEmbedded Include + + HiLink moinPreformatted String + + HiLink moinWikiWord Statement + HiLink moinBracketLink Statement + HiLink moinNormalURL Statement + HiLink moinSubLink Statement + HiLink moinInterLink Statement + HiLink moinEmail Statement + + HiLink moinBulletList Type + HiLink moinNumberedList Type + HiLink moinAlphalist Type + HiLink moinRomanlist Type + HiLink moinBigromanlist Type + HiLink moinDescriptionlist Type + + HiLink moinRule Special + + HiLink moinComment Comment + + HiLink moinVariable Macro + + delcommand HiLink +endif + +let b:current_syntax = "moin" diff --git a/.vim/bundle/.gitignore b/.vim/bundle/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.vim/bundle/Gist.vim.git b/.vim/bundle/Gist.vim.git new file mode 160000 index 0000000..ae0ca2e --- /dev/null +++ b/.vim/bundle/Gist.vim.git @@ -0,0 +1 @@ +Subproject commit ae0ca2e5ac328b0903da94727b9d60b6b1a99b9e diff --git a/.vim/bundle/LustyJuggler.git b/.vim/bundle/LustyJuggler.git new file mode 160000 index 0000000..8aea87d --- /dev/null +++ b/.vim/bundle/LustyJuggler.git @@ -0,0 +1 @@ +Subproject commit 8aea87dab15bb13b418ac89fe8fdfbc768d727fb diff --git a/.vim/bundle/csslint.vim.git b/.vim/bundle/csslint.vim.git new file mode 160000 index 0000000..fd2cb30 --- /dev/null +++ b/.vim/bundle/csslint.vim.git @@ -0,0 +1 @@ +Subproject commit fd2cb3097d8be44b41401c61be697413548c4269 diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim new file mode 160000 index 0000000..287b9c1 --- /dev/null +++ b/.vim/bundle/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit 287b9c12aad2420269576504d1c05d36111a4562 diff --git a/.vim/bundle/govim.git b/.vim/bundle/govim.git new file mode 160000 index 0000000..3c158a0 --- /dev/null +++ b/.vim/bundle/govim.git @@ -0,0 +1 @@ +Subproject commit 3c158a06de663a15a5c841e462ab3eea8456e1c3 diff --git a/.vim/bundle/jpythonfold.vim.git b/.vim/bundle/jpythonfold.vim.git new file mode 160000 index 0000000..d816326 --- /dev/null +++ b/.vim/bundle/jpythonfold.vim.git @@ -0,0 +1 @@ +Subproject commit d816326ed3a038340a017647d8dffef826001702 diff --git a/.vim/bundle/jshint.vim.git b/.vim/bundle/jshint.vim.git new file mode 160000 index 0000000..a3f2fbb --- /dev/null +++ b/.vim/bundle/jshint.vim.git @@ -0,0 +1 @@ +Subproject commit a3f2fbb63ee52f191f01be5f7542c404a45d1123 diff --git a/.vim/bundle/mako.vim.git b/.vim/bundle/mako.vim.git new file mode 160000 index 0000000..603bf2d --- /dev/null +++ b/.vim/bundle/mako.vim.git @@ -0,0 +1 @@ +Subproject commit 603bf2dd47a9a53a218660308d7df16598c667f4 diff --git a/.vim/bundle/nerdtree.git b/.vim/bundle/nerdtree.git new file mode 160000 index 0000000..6697bb7 --- /dev/null +++ b/.vim/bundle/nerdtree.git @@ -0,0 +1 @@ +Subproject commit 6697bb7bede42dd180dbb2b62c04cf86aeab1e2e diff --git a/.vim/bundle/nginx.vim.git b/.vim/bundle/nginx.vim.git new file mode 160000 index 0000000..152bbb2 --- /dev/null +++ b/.vim/bundle/nginx.vim.git @@ -0,0 +1 @@ +Subproject commit 152bbb2dc00c2df37049ccf75f68f294208c72cb diff --git a/.vim/bundle/pep8--Driessen.git b/.vim/bundle/pep8--Driessen.git new file mode 160000 index 0000000..da3f264 --- /dev/null +++ b/.vim/bundle/pep8--Driessen.git @@ -0,0 +1 @@ +Subproject commit da3f2649860f66eae2737794f865e0dd07d55a92 diff --git a/.vim/bundle/pydoc.vim.git b/.vim/bundle/pydoc.vim.git new file mode 160000 index 0000000..3502c81 --- /dev/null +++ b/.vim/bundle/pydoc.vim.git @@ -0,0 +1 @@ +Subproject commit 3502c81c3258952cf5f9f791b81f8c2e6b834aa5 diff --git a/.vim/bundle/snipmate.vim.git b/.vim/bundle/snipmate.vim.git new file mode 160000 index 0000000..f5a75d0 --- /dev/null +++ b/.vim/bundle/snipmate.vim.git @@ -0,0 +1 @@ +Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b diff --git a/.vim/bundle/surround.vim.git b/.vim/bundle/surround.vim.git new file mode 160000 index 0000000..ea46fd0 --- /dev/null +++ b/.vim/bundle/surround.vim.git @@ -0,0 +1 @@ +Subproject commit ea46fd04abbb59c4d1c17145c7e90adb8d3702b4 diff --git a/.vim/bundle/syntastic.git b/.vim/bundle/syntastic.git new file mode 160000 index 0000000..d8386c1 --- /dev/null +++ b/.vim/bundle/syntastic.git @@ -0,0 +1 @@ +Subproject commit d8386c1211d7aa5651cf90202e66a5f22ce18c72 diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar new file mode 160000 index 0000000..24915db --- /dev/null +++ b/.vim/bundle/tagbar @@ -0,0 +1 @@ +Subproject commit 24915dbe24098d864ef77eba93ca81264268ffc8 diff --git a/.vim/bundle/tcomment_vim.git b/.vim/bundle/tcomment_vim.git new file mode 160000 index 0000000..16a9e4c --- /dev/null +++ b/.vim/bundle/tcomment_vim.git @@ -0,0 +1 @@ +Subproject commit 16a9e4c843748bddaae41ec04614efdd29abe6fa diff --git a/.vim/bundle/tlib_vim.git b/.vim/bundle/tlib_vim.git new file mode 160000 index 0000000..53435ee --- /dev/null +++ b/.vim/bundle/tlib_vim.git @@ -0,0 +1 @@ +Subproject commit 53435eef9eb944184e021aa382a8ec85d59dfc94 diff --git a/.vim/bundle/tslime.vim.git b/.vim/bundle/tslime.vim.git new file mode 160000 index 0000000..0667ffc --- /dev/null +++ b/.vim/bundle/tslime.vim.git @@ -0,0 +1 @@ +Subproject commit 0667ffcb2e069568a86de22f6d0275d8b4604a7a diff --git a/.vim/bundle/vim-css-color.git b/.vim/bundle/vim-css-color.git new file mode 160000 index 0000000..9802f41 --- /dev/null +++ b/.vim/bundle/vim-css-color.git @@ -0,0 +1 @@ +Subproject commit 9802f419b8e5b62c49b1c3b75d171cf1451ab666 diff --git a/.vim/bundle/vim-darkdevel.git b/.vim/bundle/vim-darkdevel.git new file mode 160000 index 0000000..ac039ef --- /dev/null +++ b/.vim/bundle/vim-darkdevel.git @@ -0,0 +1 @@ +Subproject commit ac039ef11c734af61e3f83b77bc819838e8bf1f7 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive new file mode 160000 index 0000000..54ead5a --- /dev/null +++ b/.vim/bundle/vim-fugitive @@ -0,0 +1 @@ +Subproject commit 54ead5abcbfdd776e1160b5510a129884c39f29c diff --git a/.vim/bundle/vim-handlebars b/.vim/bundle/vim-handlebars new file mode 160000 index 0000000..30f7f7d --- /dev/null +++ b/.vim/bundle/vim-handlebars @@ -0,0 +1 @@ +Subproject commit 30f7f7d45c10bf5b023ae62d85c3843aad16b0a8 diff --git a/.vim/bundle/vim-javascript.git b/.vim/bundle/vim-javascript.git new file mode 160000 index 0000000..22475fc --- /dev/null +++ b/.vim/bundle/vim-javascript.git @@ -0,0 +1 @@ +Subproject commit 22475fcbc630d8048885fbe2badbcbefb235f8d1 diff --git a/.vim/bundle/vim-less b/.vim/bundle/vim-less new file mode 160000 index 0000000..8443f89 --- /dev/null +++ b/.vim/bundle/vim-less @@ -0,0 +1 @@ +Subproject commit 8443f89070cedf35481fd8b841ee5ba38cf80984 diff --git a/.vim/bundle/vim-markdown.git b/.vim/bundle/vim-markdown.git new file mode 160000 index 0000000..10073c3 --- /dev/null +++ b/.vim/bundle/vim-markdown.git @@ -0,0 +1 @@ +Subproject commit 10073c3a3c363c34681c2e37ae29e9675e2cde90 diff --git a/.vim/bundle/vim-powerline b/.vim/bundle/vim-powerline new file mode 160000 index 0000000..09c0cea --- /dev/null +++ b/.vim/bundle/vim-powerline @@ -0,0 +1 @@ +Subproject commit 09c0cea859a2e0989eea740655b35976d951a84e diff --git a/.vim/bundle/vim-smartinput.git b/.vim/bundle/vim-smartinput.git new file mode 160000 index 0000000..78ab4b3 --- /dev/null +++ b/.vim/bundle/vim-smartinput.git @@ -0,0 +1 @@ +Subproject commit 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 diff --git a/.vim/bundle/vim-supertab.git b/.vim/bundle/vim-supertab.git new file mode 160000 index 0000000..096be34 --- /dev/null +++ b/.vim/bundle/vim-supertab.git @@ -0,0 +1 @@ +Subproject commit 096be343f89c63fc086a55262f2f264d0d0524b0 diff --git a/.vim/bundle/vim-yui3.git b/.vim/bundle/vim-yui3.git new file mode 160000 index 0000000..37232e3 --- /dev/null +++ b/.vim/bundle/vim-yui3.git @@ -0,0 +1 @@ +Subproject commit 37232e39d73ad8bf0567f171463a8068dc0a2755 diff --git a/.vim/bundle/xmledit.git b/.vim/bundle/xmledit.git new file mode 160000 index 0000000..e575574 --- /dev/null +++ b/.vim/bundle/xmledit.git @@ -0,0 +1 @@ +Subproject commit e575574418a3c1cccc3a516dd0fee7f0717dadb5 diff --git a/.vim/colors/Tomorrow-Night.vim b/.vim/colors/Tomorrow-Night.vim new file mode 100644 index 0000000..d13325d --- /dev/null +++ b/.vim/colors/Tomorrow-Night.vim @@ -0,0 +1,310 @@ +" Tomorrow Night - Full Colour and 256 Colour +" http://chriskempson.com +" +" Hex colour conversion functions borrowed from the theme "Desert256"" + +let g:colors_name = "Tomorrow-Night" + +" Default GUI Colours +let s:foreground = "c5c8c6" +let s:background = "1d1f21" +let s:selection = "373b41" +let s:line = "282a2e" +let s:comment = "969896" +let s:red = "cc6666" +let s:orange = "de935f" +let s:yellow = "f0c674" +let s:green = "b5bd68" +let s:blue = "81a2be" +let s:purple = "b294bb" + +" Console 256 Colours +if !has("gui_running") + let s:background = "303030" + let s:line = "3a3a3a" + let s:selection = "585858" +end + +set background=dark +hi clear +syntax reset + +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:foreground, "", "") + call X("NonText", s:selection, "", "") + call X("SpecialKey", s:selection, "", "") + call X("Search", "", s:selection, "") + call X("StatusLine", s:foreground, s:background, "reverse") + call X("StatusLineNC", s:foreground, s:background, "reverse") + 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, "", "") + 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") + end + + " Standard Highlighting + call X("Comment", s:comment, "", "") + call X("Todo", s:comment, "", "") + 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("String", s:green, "", "") + call X("Special", s:foreground, "", "") + call X("PreProc", s:purple, "", "") + call X("Operator", s:foreground, "", "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, "", "") + + " PHP Highlighting + call X("phpVarSelector", s:red, "", "") + call X("phpKeyword", s:purple, "", "") + + " Ruby Highlighting + call X("rubySymbol", s:green, "", "") + call X("rubyConstant", s:yellow, "", "") + call X("rubyAttribute", s:blue, "", "") + call X("rubyInclude", s:blue, "", "") + call X("rubyLocalVariableOrMethod", s:orange, "", "") + call X("rubyCurlyBlock", s:orange, "", "") + + " 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 \ No newline at end of file diff --git a/.vim/colors/aldmeris.vim b/.vim/colors/aldmeris.vim new file mode 100644 index 0000000..a4b70e7 --- /dev/null +++ b/.vim/colors/aldmeris.vim @@ -0,0 +1,362 @@ +" Vim color scheme +" Name: aldmeris.vim +" Maintainer: Vincent Velociter +" Version: 1.0 +" Url: https://github.com/veloce/vim-aldmeris + +" Aldmeris is based on the gedit oblivion theme for vim. +" The original theme is part of GtkSourceView. +" Original author: Paolo Borelli . +" + +" Usage {{{ +" ------------ +" NOTE FOR TERMINAL USERS: +" ----------------------- +" The colorscheme is compatible with terminals that support 256 colors. See: +" +" http://vim.wikia.com/wiki/256_colors_in_vim +" +" If your terminal uses the tango palette for its base colors (which is, +" I believe, the default in gnome-terminal), you can obtain the most accurate +" result with aldmeris by setting this option in your .vimrc: +" +" let g:aldmeris_termcolors = "tango" +" +" Below is an .Xdefaults example of that palette: +" +" ! Black +" *color0: #2E3436 +" *color8: #555753 +" ! Red +" *color1: #CC0000 +" *color9: #EF2929 +" ! Green +" *color2: #4E9A06 +" *color10: #8AE234 +" ! Yellow +" *color3: #C4A000 +" *color11: #FCE94F +" ! Blue +" *color4: #3465A4 +" *color12: #729FCF +" ! Purple +" *color5: #75507B +" *color13: #AD7FA8 +" ! Cyan +" *color6: #06989A +" *color14: #34E2E2 +" ! White +" *color7: #D3D7CF +" *color15: #EEEEEC +" +" TANGO PALETTE: +" ---------------------------------- +" Name Gui xterm/hex +" ----------- -------- ----------- +" butter1 #fce94f 221 #ffd75f +" butter2 #edd400 220 #ffd700 +" butter3 #c4a000 178 #d7af00 +" chameleon1 #8ae234 113 #87d75f +" chameleon2 #73d216 76 #5fd700 +" chameleon3 #4e9a06 64 #5f8700 +" orange1 #fcaf3e 215 #ffaf5f +" orange2 #f57900 208 #ff8700 +" orange3 #ce5c00 166 #d75f00 +" skyblue1 #729fcf 74 #5fafd7 +" skyblue2 #3465a4 61 #5f5faf +" skyblue3 #204a87 24 #005f87 +" plum1 #ad7fa8 139 #af87af +" plum2 #75507b 96 #875f87 +" plum3 #5c3566 239 #4e4e4e +" chocolate1 #e9b96e 179 #d7af5f +" chocolate2 #c17d11 136 #af8700 +" chocolate3 #8f5902 94 #875f00 +" scarletred1 #ef2929 196 #ff0000 +" scarletred2 #cc0000 160 #d70000 +" scarletred3 #a40000 124 #af0000 +" aluminium1 #eeeeec 231 #ffffff +" aluminium2 #d3d7cf 252 #d0d0d0 +" aluminium3 #babdb6 250 #bcbcbc +" aluminium4 #888a85 102 #878787 +" aluminium5 #555753 240 #585858 +" aluminium6 #2e3436 236 #303030 +" }}} +" Colorscheme initialization {{{ +" -------------------------- +if has("gui_running") + set background=dark +endif +hi clear +if exists("syntax_on") + syntax reset +endif + +let g:colors_name = "aldmeris" +" }}} +" Custom highlight function {{{ +if has("gui_running") + let s:hi_args = ['guibg', 'guifg', 'gui', 'guisp'] +else + let s:hi_args = ['ctermbg', 'ctermfg', 'cterm'] +endif +function! s:Hi(name, ...) + let command = 'hi ' . a:name + for i in range(0,len(a:000)-1) + let command .= ' ' . s:hi_args[i] . '=' . a:000[i] + endfor + exe command +endfunc +" }}} +" Default options and env settings {{{ +" -------------------------------- +if !exists("g:aldmeris_termcolors") + let g:aldmeris_termcolors = "xterm" +endif + +" List terminals that support italics (I'm sure only for xrvt) +let s:terms_italic = ["rxvt", "rxvt-unicode", "rxvt-unicode-256color"] +" }}} +" Gui & term palettes definition {{{ +" ------------------------------ +if has("gui_running") + let s:butter1 = "#fce94f" + let s:butter2 = "#edd400" + let s:chameleon1 = "#8ae234" + let s:chameleon3 = "#4e9a06" + let s:orange1 = "#fcaf3e" + let s:orange2 = "#f57900" + let s:orange3 = "#ce5c00" + let s:skyblue1 = "#729fcf" + let s:skyblue2 = "#3465a4" + let s:plum1 = "#ad7fa8" + let s:plum2 = "#75507b" + let s:scarletred1 = "#ef2929" + let s:scarletred2 = "#cc0000" + let s:aluminium1 = "#eeeeec" + let s:aluminium2 = "#d3d7cf" + let s:aluminium3 = "#babdb6" + let s:aluminium4 = "#888a85" + let s:aluminium5 = "#555753" + let s:aluminium6 = "#2e3436" + let s:black = "#000000" +elseif &t_Co == 256 && g:aldmeris_termcolors == "tango" + let s:butter1 = "11" + let s:butter2 = "220" + let s:chameleon1 = "10" + let s:chameleon3 = "2" + let s:orange1 = "215" + let s:orange2 = "208" + let s:orange3 = "166" + let s:skyblue1 = "12" + let s:skyblue2 = "4" + let s:plum1 = "13" + let s:plum2 = "5" + let s:scarletred1 = "9" + let s:scarletred2 = "1" + let s:aluminium1 = "15" + let s:aluminium2 = "7" + let s:aluminium3 = "250" + let s:aluminium4 = "102" + let s:aluminium5 = "8" + let s:aluminium6 = "0" + let s:black = "16" +elseif &t_Co == 256 + let s:butter1 = "221" + let s:butter2 = "220" + let s:chameleon1 = "113" + let s:chameleon3 = "64" + let s:orange1 = "215" + let s:orange2 = "208" + let s:orange3 = "166" + let s:skyblue1 = "74" + let s:skyblue2 = "61" + let s:plum1 = "139" + let s:plum2 = "96" + let s:scarletred1 = "196" + let s:scarletred2 = "160" + let s:aluminium1 = "231" + let s:aluminium2 = "252" + let s:aluminium3 = "250" + let s:aluminium4 = "102" + let s:aluminium5 = "240" + let s:aluminium6 = "236" + let s:black = "16" +else + let s:butter1 = "LightYellow" + let s:butter2 = "Yellow" + let s:chameleon1 = "LightGreen" + let s:chameleon3 = "DarkGreen" + let s:orange1 = "LightCyan" + let s:orange2 = "Cyan" + let s:orange3 = "DarkCyan" + let s:skyblue1 = "LightBlue" + let s:skyblue2 = "Blue" + let s:plum1 = "LightMagenta" + let s:plum2 = "Magenta" + let s:scarletred1 = "LightRed" + let s:scarletred2 = "Red" + let s:aluminium1 = "White" + let s:aluminium2 = "White" + let s:aluminium3 = "LightGray" + let s:aluminium4 = "Gray" + let s:aluminium5 = "DarkGray" + let s:aluminium6 = "DarkGrey" + let s:black = "Black" +endif +" }}} +" Syntax groups colors (:help group-name) {{{ +" --------------------------------------- +call s:Hi( 'Normal', s:aluminium6, s:aluminium2 ) +call s:Hi( 'Comment', "bg", s:aluminium4, "italic" ) +call s:Hi( 'Constant', "bg", s:butter2 ) +call s:Hi( 'Boolean', "bg", s:orange3 ) +call s:Hi( 'Identifier', "bg", s:skyblue1, "NONE" ) +call s:Hi( 'Statement', "bg", s:aluminium1, "bold" ) +call s:Hi( 'PreProc', "bg", s:plum1 ) +call s:Hi( 'Type', "bg", s:chameleon1, "bold" ) +call s:Hi( 'Special', "bg", s:orange1 ) +call s:Hi( 'SpecialChar', "bg", s:orange3 ) +call s:Hi( 'Underlined', "bg", s:skyblue1, "underline" ) +call s:Hi( 'Error', s:scarletred2, s:aluminium1, "bold" ) +call s:Hi( 'Todo', s:butter1, s:aluminium4, "bold" ) + +" italic is a special case +if !has("gui_running") + if (index(s:terms_italic, &term) < 0) + hi Comment cterm=NONE + endif +endif +" }}} +" Highlight default (:help highlight-default) {{{ +" ------------------------------------------- +" ColorColumn used for the columns set with 'colorcolumn' +" Conceal placeholder characters substituted for concealed +call s:Hi( 'Cursor', s:aluminium2, s:black ) +" CursorIM like Cursor, but used when in IME mode +call s:Hi( 'CursorColumn', s:aluminium5, "NONE", "NONE" ) +call s:Hi( 'CursorLine', s:aluminium5, "NONE", "NONE" ) +call s:Hi( 'Directory', "bg", s:skyblue1, "NONE" ) +call s:Hi( 'DiffAdd', s:aluminium5, s:chameleon3, "bold" ) +call s:Hi( 'DiffChange', s:aluminium5, s:orange1, "bold" ) +call s:Hi( 'DiffDelete', s:aluminium5, s:scarletred2, "bold" ) +call s:Hi( 'DiffText', s:aluminium5, s:skyblue1, "bold" ) +call s:Hi( 'ErrorMsg', s:scarletred2, s:aluminium1 ) +call s:Hi( 'VertSplit', s:aluminium4, s:aluminium6, "bold" ) +call s:Hi( 'Folded', "bg", s:aluminium3, "bold,underline" ) +call s:Hi( 'FoldColumn', s:aluminium3, s:aluminium5 ) +call s:Hi( 'SignColumn', s:aluminium3, s:aluminium5 ) +" IncSearch 'incsearch' highlighting +call s:Hi( 'LineNr', s:black, s:aluminium5 ) +call s:Hi( 'MatchParen', s:plum1, s:aluminium1 ) +" ModeMsg 'showmode' message (e.g. , "-- INSERT --") +call s:Hi( 'MoreMsg', "bg", s:chameleon1, "bold" ) +call s:Hi( 'NonText', "bg", s:aluminium5 ) +call s:Hi( 'Pmenu', s:black, s:aluminium3 ) +call s:Hi( 'PmenuSel', s:aluminium5, s:aluminium1 ) +call s:Hi( 'PmenuSbar', s:aluminium5, s:aluminium5 ) +call s:Hi( 'PmenuThumb', s:aluminium4, s:aluminium4 ) +call s:Hi( 'Question', "bg", s:chameleon1, "bold" ) +call s:Hi( 'Search', s:chameleon3, s:aluminium1 ) +call s:Hi( 'SpecialKey', "bg", s:aluminium5 ) + if has("gui_running") +call s:Hi( 'SpellBad', "bg", "NONE", "undercurl", s:scarletred1 ) +call s:Hi( 'SpellCap', "bg", "NONE", "undercurl", s:skyblue1 ) +call s:Hi( 'SpellLocal', "bg", "NONE", "undercurl", s:orange1 ) +call s:Hi( 'SpellRare', "bg", "NONE", "undercurl", s:plum1 ) + else +call s:Hi( 'SpellBad', s:scarletred2, "NONE", "undercurl" ) +call s:Hi( 'SpellCap', s:skyblue2, "NONE", "undercurl" ) +call s:Hi( 'SpellLocal', s:orange2, "NONE", "undercurl" ) +call s:Hi( 'SpellRare', s:plum2, "NONE", "undercurl" ) + endif +call s:Hi( 'StatusLine', s:aluminium6, s:aluminium3, "bold,reverse" ) +call s:Hi( 'StatusLineNC', s:aluminium4, s:aluminium6, "NONE" ) +" 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 +call s:Hi( 'Title', "bg", s:butter1, "bold" ) +call s:Hi( 'Visual', s:aluminium4, s:aluminium1 ) +" VisualNOS Visual mode selection when vim is "Not Owning the Selection". +call s:Hi( 'WarningMsg', "bg", s:scarletred1 ) +call s:Hi( 'WildMenu', s:butter2, s:aluminium6 ) +" }}} +" gitcommit colors {{{ +" ---------------- +hi link gitEmail SpecialChar +hi link gitEmailDelimiter gitEmail +hi link gitcommitComment Comment +hi link gitcommitHeader gitcommitComment +hi link gitcommitUntracked gitcommitComment +hi link gitcommitDiscarded gitcommitComment +hi link gitcommitSelected gitcommitComment +call s:Hi( 'gitcommitDiscardedType', "NONE", s:scarletred1 ) +call s:Hi( 'gitcommitSelectedType', "NONE", s:chameleon1 ) +call s:Hi( 'gitcommitUnmergedType', "NONE", s:butter1 ) +call s:Hi( 'gitcommitUntrackedFile', "NONE", s:plum1, "bold" ) +call s:Hi( 'gitcommitDiscardedFile', "NONE", s:scarletred1, "bold" ) +call s:Hi( 'gitcommitSelectedFile', "NONE", s:chameleon1, "bold" ) +call s:Hi( 'gitcommitUnmergedFile', "NONE", s:butter1, "bold" ) +" }}} +" diff colors {{{ +hi link diffFile Special +hi link diffNewFile diffFile +call s:Hi( 'diffAdded', "NONE", s:chameleon1 ) +call s:Hi( 'diffRemoved', "NONE", s:scarletred1 ) +" }}} +" XML Colors {{{ +" ---------- +hi link xmlTag Identifier +hi link xmlEndTag xmlTag +hi link xmlTagName xmlTag +hi link xmlString String +" }}} +"HTML Colors {{{ +"----------- +hi link htmlTag xmlTag +hi link htmlEndTag xmlEndTag +hi link htmlTagName xmlTagName +hi link htmlSpecialTagName xmlTagName +hi link htmlString xmlString +hi link htmlSpecialChar PreProc +hi link Javascript Normal +" }}} +" Ruby colors {{{ +" ----------- +hi link rubyClass Keyword +hi link rubyDefine Keyword +" }}} +" Javascript colors {{{ +hi link javaScriptBraces normal +" following syntax from https://github.com/pangloss/vim-javascript +hi link javaScriptLabel Identifier +hi link javaScriptThis Identifier +" }}} +" PHP Colors {{{ +" ---------- +hi link phpVarSelector Identifier +hi link phpIdentifier Identifier +hi link phpParent Normal +hi link phpFunctions Function +hi link phpSpecial Special +hi link phpMemberSelector Keyword +hi link phpBoolean Boolean +hi link phpNumber Number +" }}} +" CSS Colors {{{ +" ---------- +hi link cssIdentifier Normal +hi link cssClassName Normal +hi link cssTagName Normal +hi link cssBraces Normal +hi link cssRenderProp Keyword +hi link cssBoxProp cssRenderProp +hi link cssUIProp cssRenderProp +hi link cssColorProp cssRenderProp +hi link cssFontProp cssRenderProp +hi link cssTextProp cssRenderProp +hi link cssGeneratedContentProp cssRenderProp +hi link cssValueLength Boolean +hi link cssPseudoClassId Identifier +" }}} +" vim:foldmethod=marker diff --git a/.vim/colors/ambient.vim b/.vim/colors/ambient.vim new file mode 100644 index 0000000..217c7b5 --- /dev/null +++ b/.vim/colors/ambient.vim @@ -0,0 +1,61 @@ +" Maintainer: Kevin Hamer +" Version: 1.2 +" Last Change: Fri Aug 12 16:53:40 EDT 2011 + +" Changes: +" 1.2 lightened the blue slightly +" 1.1 lightened both orange-reds + +"" Based off the colors for Ambiance, the 2011 Ubuntu dark human theme. +"" Derived from Mustang by Henrique C. Alves (hcarvalhoalves@gmail.com) +"" Offers 256 color support. + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "ambient" + +" Vim >= 7.0 specific colors +if version >= 700 + hi CursorLine guibg=#3c3c3c ctermbg=237 + hi CursorColumn guibg=#3c3c3c ctermbg=237 + hi MatchParen guifg=#e69c0d ctermfg=178 guibg=#3c3c3c ctermbg=237 gui=bold cterm=bold + hi Pmenu guifg=#ffffff ctermfg=15 guibg=#4c4c4c ctermbg=239 + hi PmenuSel guifg=#000000 ctermfg=0 guibg=#f07746 ctermbg=209 +endif + +" General colors +hi Cursor guifg=NONE guibg=#4c4c4c ctermbg=239 gui=none +hi Normal guifg=#f2f1f0 ctermfg=7 guibg=#202020 ctermbg=234 gui=none +hi NonText guifg=#3c3c3c ctermfg=237 gui=none +hi LineNr guifg=#4c4c4c ctermfg=239 gui=none +hi StatusLine guifg=#d3d3d5 ctermfg=188 guibg=#3c3c3c ctermbg=237 +hi StatusLineNC guifg=#939395 ctermfg=246 guibg=#3c3c3c ctermbg=237 gui=none +hi VertSplit guifg=#202020 ctermfg=234 guibg=#3c3c3c ctermbg=237 gui=none +hi Folded guifg=#37c6e5 ctermfg=80 guibg=#3c3c3c ctermbg=237 gui=none +hi Title guifg=#f2f1f0 ctermfg=7 guibg=NONE gui=bold cterm=bold +hi Visual guifg=#ffffff ctermfg=15 guibg=#4c4c4c ctermbg=239 gui=none +hi SpecialKey guifg=#4c4c4c ctermfg=239 gui=none + +" Syntax highlighting +hi Comment guifg=#7c7c7c ctermfg=8 +hi Boolean guifg=#89d958 ctermfg=113 gui=none +hi String guifg=#f07746 ctermfg=209 +hi Identifier guifg=#d9c634 ctermfg=185 gui=none +hi Function guifg=#ffffff ctermfg=15 gui=bold cterm=bold +hi Type guifg=#e69c0d ctermfg=178 gui=none +hi Statement guifg=#f2f1f0 ctermfg=7 gui=bold cterm=bold +hi Keyword guifg=#d9c634 ctermfg=185 gui=none +hi Constant guifg=#d9c634 ctermfg=185 gui=none +hi Number guifg=#89d958 ctermfg=113 gui=none +hi Special guifg=#d9c634 ctermfg=185 gui=none +hi PreProc guifg=#faf4c6 ctermfg=230 gui=none +hi Todo guifg=#202020 ctermfg=234 guibg=#d9c634 ctermbg=185 + +" Code-specific colors +hi pythonOperator guifg=#f07746 ctermfg=209 gui=none diff --git a/.vim/colors/chance-of-storm.vim b/.vim/colors/chance-of-storm.vim new file mode 100644 index 0000000..f71d871 --- /dev/null +++ b/.vim/colors/chance-of-storm.vim @@ -0,0 +1,141 @@ +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Author: Mario Gutierrez (mario@mgutz.com) +" Last Change: Dececember 1, 2010 +" Version: 0.1 +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "chance-of-storm" + + +"""""""""" General + +hi Normal guifg=#c8d7e6 guibg=#14181c gui=none + +" Vim >= 7.0 +if version >= 700 + hi CursorLine guibg=#23292f + hi MatchParen guifg=magenta guibg=bg gui=bold + hi Pmenu guifg=#dfeff6 guibg=#1E415E + hi PmenuSel guifg=#dfeff6 guibg=#2D7889 + + hi IncSearch guifg=bg guibg=#AF81F4 gui=bold + hi Search guifg=bg guibg=#AF81F4 gui=none +endif + +hi Cursor guifg=NONE guibg=#607080 gui=none +hi Folded guifg=#68CEE8 guibg=#1A3951 gui=none +hi FoldColumn guifg=#1E415E guibg=#1A3951 gui=none +hi LineNr guifg=#2e363d guibg=bg gui=none +" e.g. tildes at the end of file +hi NonText guifg=#2e363d guibg=bg gui=none +hi StatusLine guifg=#f98fcc guibg=#000000 gui=none +hi StatusLineNC guifg=#69839a guibg=#0d0f11 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=#ef7760 guibg=bg gui=none +hi VertSplit guifg=#0d0f11 guibg=#0d0f11 gui=none + " Selected text color +hi Visual guifg=#dfeff6 guibg=#24557A gui=none + + +"""""""""" Syntax highlighting + +hi Comment guifg=#69839a guibg=bg gui=italic +hi Constant guifg=#96defa gui=none +hi Function guifg=#9e7cd7 gui=none +hi Identifier guifg=#8ac6f2 gui=none +hi Ignore guifg=bg guibg=bg gui=none +hi Keyword guifg=#8ac6f2 gui=none +hi Number guifg=#dfe1b7 gui=none +hi PreProc guifg=#f99d71 gui=none +hi Special guifg=lightmagenta gui=none +hi Statement guifg=#7cd5d7 gui=none +hi String guifg=#89e14b gui=italic +hi Todo guifg=#ADED80 guibg=bg gui=bold +hi Type guifg=#489fd7 gui=none +hi Underlined guifg=#8ac6f2 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 + + +"""""""""" MARKDOWN (tpope's vim-markdown) + +hi link markdownCodeBlock Statement +hi link markdownCode Statement +hi link markdownCodeDelimiter Statement +hi link markdownHeadingDelimiter Title +hi markdownLinkText guifg=#489fd7 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 + + +"""""""""" Ruby + +hi rubyAccess guifg=#ef7760 guibg=bg gui=italic +hi rubyInterpolation guifg=#c8e1b7 guibg=bg +hi link rubyInterpolationDelimiter rubyInterpolation +hi link rubyStringDelimiter String + + +""""""""""" XML + +hi link xmlTag htmlTag +hi link xmlEndTag htmlEndTag +hi link xmlTagName htmlTagName diff --git a/.vim/colors/darkdevel.vim b/.vim/colors/darkdevel.vim deleted file mode 100644 index 02a506f..0000000 --- a/.vim/colors/darkdevel.vim +++ /dev/null @@ -1,217 +0,0 @@ -" Vim color scheme -" -" Name: darkdevel.vim -" Maintainer: Hallison Batista -" Last Change: 26 Fev 2009 -" License: Public Domain -" Version: 1.0.0 - -highlight clear - -if exists("syntax_on") - syntax reset -endif - -let g:colors_name = "darkdevel" - -" General settings -" ================ -set background=dark -set cursorline -"set cursorcolumn - -" Cursor style -" ============ - highlight Cursor ctermfg=NONE guifg=#000000 ctermbg=NONE guibg=#FFFFFF - "CursorIM - highlight CursorColumn ctermfg=NONE guifg=NONE ctermbg=DarkGray guibg=#0F0F0F - highlight CursorLine ctermfg=NONE guifg=NONE ctermbg=DarkGray guibg=#0F0F0F - -" Directory style -" =============== - "highlight Directory ctermbg=NONE guifg=NONE ctermbg=NONE guibg=NONE cterm=bold gui=underline - -" Diff text style -" =============== - highlight DiffAdd ctermfg=DarkGreen guifg=#32BE32 ctermbg=NONE guibg=NONE - "highlight DiffChange - highlight DiffDelete ctermfg=DarkRed guifg=#BE3232 ctermbg=NONE guibg=NONE - "highlight DiffText - -" Text and message style -" ====================== - "highlight ErrorMsg - "highlight VertSplit - "highlight Folded - "highlight FoldColumn - "highlight SignColumn - "highlight IncSearch - highlight LineNr ctermfg=DarkGray guifg=#777777 ctermbg=DarkGray guibg=#0F0F0F - "highlight MatchParen - "highlight ModeMsg - "highlight MoreMsg - highlight NonText ctermfg=Gray guifg=#777777 ctermbg=NONE guibg=#111111 - highlight Normal ctermfg=Gray guifg=#CCCCCC ctermbg=NONE guibg=#111111 - -" Popup menu style -" ================ - highlight Pmenu ctermfg=Gray guifg=#FFFFFF ctermbg=DarkGray guibg=#0F0F0F - highlight PmenuSel ctermfg=White guifg=#0F0F0F ctermbg=Gray guibg=#FFFFFF - highlight PmenuSbar ctermfg=NONE guifg=NONE ctermbg=DarkGray guibg=#777777 - highlight PmenuThumb ctermfg=Gray guifg=#CCCCCC ctermbg=NONE guibg=NONE - - "highlight Question - "highlight Search - "highlight SpecialKey - -" Spelling style -" ============== - "highlight SpellBad - "highlight SpellCap - "highlight SpellLocal - "highlight SpellRare - -" Status style -" ============ - highlight StatusLine ctermfg=DarkGray guifg=#0F0F0F ctermbg=Gray guibg=#777777 cterm=bold gui=bold - highlight StatusLineNC ctermfg=DarkGray guifg=#777777 ctermbg=DarkGray guibg=#0F0F0F cterm=bold gui=bold - - "highlight TabLine - "highlight TabLineFill - "highlight TabLineSel - - highlight Title ctermfg=Gray guifg=#0F0F0F - highlight Visual ctermfg=NONE guifg=NONE ctermbg=DarkBlue guibg=#505064 - highlight VisualNOS ctermfg=NONE guifg=NONE ctermbg=DarkGreen guibg=#506450 - highlight WarningMsg ctermfg=White guifg=#FFFFFF ctermbg=DarkRed guibg=#964B4B - highlight WildMenu ctermfg=NONE guifg=#777777 ctermbg=DarkGray guibg=#0F0F0F - -" Win32 specific style -" -------------------- - "highlight Menu - "highlight Scrollbar - "highlight Tooltip - -" Syntax style -" ============ - -" Style for constants -" ------------------- - highlight Constant ctermfg=DarkRed guifg=#6496C8 - highlight String ctermfg=DarkGreen guifg=#64C896 - highlight Character ctermfg=DarkBlue guifg=#6496C8 - highlight Number ctermfg=DarkGreen guifg=#64C896 - highlight Boolean ctermfg=DarkBlue guifg=#6496C8 - highlight Float ctermfg=DarkGreen guifg=#64C896 - - highlight Comment ctermfg=DarkGray guifg=#646464 ctermbg=NONE guibg=NONE - -" Style for identifier and variable names -" ---------------------------------------- - highlight Identifier ctermfg=DarkCyan guifg=#6496C8 gui=NONE - highlight Function ctermfg=Yellow guifg=#FFC864 gui=NONE - -" Style for statements -" --------------------- - "Statement any statement - highlight Statement ctermfg=Brown guifg=#C89664 gui=NONE - highlight link Conditional Statement - highlight link Repeat Statement - highlight link Label Statement - highlight Operator ctermfg=Green guifg=#64C864 - highlight Keyword ctermfg=DarkRed guifg=#C86432 - highlight link Exception Statement - -" Style for generic preprocessor -" ------------------------------ - highlight PreProc ctermfg=Gray guifg=#DCDCDC ctermbg=NONE guibg=NONE - highlight Include ctermfg=DarkRed guifg=#C86432 ctermbg=NONE guibg=NONE - highlight link Define Include - highlight link Macro Include - highlight link PreCondit Include - -" Style for types and objects -" --------------------------- - highlight Type ctermfg=DarkRed guifg=#DC4B32 gui=NONE - highlight link StorageClass Type - highlight link Structure Type - highlight link Typedef Type - - - highlight Error guifg=#000000 guibg=#FF0000 - highlight Search guibg=#FFFF00 - -" Style for special symbols -" ------------------------- - "highlight Special - "highlight SpecialChar - "highlight Tag - "highlight Delimiter - "highlight SpecialComment - "highlight Debug - -" Style for text format -" --------------------- - "highlight Underlined - "highlight Ignore - "highlight Error - "highlight Todo - -" Style for Shell Syntax -" ---------------------- - "highlight shTest - "highlight shCase - "highlight shCaseExSingleQuote - "highlight shCaseEsac - "highlight shDo - "highlight shExpr - "highlight shFor - "highlight shIf - "highlight shSubSh - "highlight shComma - "highlight shDerefVarArray - "highlight shDblBrace - "highlight shSpecialVar - "highlight shDblParen - "highlight shCurlyIn - "highlight bashSpecialVariables - "highlight bashStatement - "highlight bashAdminStatement - "highlight kshSpecialVariables - "highlight kshStatement - "highlight shSetIdentifier - "highlight shFunctionTwo - "highlight shFunctionStart - "highlight shFunctionOne - "highlight shDerefPattern - "highlight shDerefEscape - "highlight shDerefPPSleft - "highlight shDerefPPSright - "highlight shCaseEsacSync - "highlight shDoSync - "highlight shForSync - "highlight shIfSync - "highlight shUntilSync - "highlight shWhileSync - -" Style for Ruby Syntax -" --------------------- - highlight rubyBlockParameter guifg=#FFFFFF - highlight rubyClass guifg=#FFFFFF - highlight rubyConstant guifg=#DA4939 - highlight rubyInstanceVariable guifg=#D0D0FF - highlight rubyInterpolation guifg=#519F50 - highlight rubyLocalVariableOrMethod guifg=#D0D0FF - highlight rubyPredefinedConstant guifg=#DA4939 - highlight rubyPseudoVariable guifg=#FFC66D - highlight rubyStringDelimiter guifg=#A5C261 - -" Style for XML and (X)HTML Syntax - highlight xmlTag guifg=#E8BF6A - highlight xmlTagName guifg=#E8BF6A - highlight xmlEndTag guifg=#E8BF6A - - highlight link htmlTag xmlTag - highlight link htmlTagName xmlTagName - highlight link htmlEndTag xmlEndTag - diff --git a/.vim/colors/diablo3.vim b/.vim/colors/diablo3.vim new file mode 100644 index 0000000..0a4806b --- /dev/null +++ b/.vim/colors/diablo3.vim @@ -0,0 +1,226 @@ +" Vim color file +" Name: diablo3 +" Maintainer: Vayn +" Last Change: 2011年 05月 30日 星期一 12:52:10 CST +" Thanks To: lilydjwg, Tomas Restrepo (author of molokai.vim) +" Options: +" +" If you want to set long line warning, copy this in your vimrc: +" +" let g:diablo3_longline = 1 +" +" +" The default length of a line is 120, you can change it by putting +" the following in your vimrc: +" +" let g:diablo3_len = 79 +" +" Notice the length here is the length you want to set plus 1. +" +" + +hi clear + +set background=dark +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="diablo3" + +" Error format when a line is longer than g:diablo3_longlen, default +" length is 120. +if exists('g:diablo3_longline') && g:diablo3_longline == 1 + if ! exists('g:diablo3_len') + let g:diablo3_len = 121 + end + exe 'match LongLineWarning "\%'.g:diablo3_len.'v.*"' +end + +hi Boolean guifg=#ae81ff gui=bold +hi Character guifg=#e6db74 +hi Number guifg=#ae81ff +hi String guifg=#fadc11 +hi Conditional guifg=#6d8fd9 gui=bold +hi Constant guifg=#d4ff36 gui=bold +hi Cursor guifg=#000000 guibg=#f8f8f0 +hi Debug guifg=#bca3a3 gui=bold +hi Define guifg=#66d9ef +hi Delimiter guifg=#8f8f8f +hi DiffAdd guibg=#13354a +hi DiffChange guifg=#89807d guibg=#4c4745 +hi DiffDelete guifg=#960050 guibg=#1e0010 +hi DiffText guibg=#4c4745 gui=italic,bold + +hi Directory guifg=#a6e22e gui=bold +hi Error guifg=#960050 guibg=#1e0010 +hi ErrorMsg guifg=#f92672 guibg=#232526 gui=bold +hi Exception guifg=#a6e22E gui=bold +hi Float guifg=#ae81fF +hi FoldColumn guifg=#465457 guibg=#000000 +hi Folded guifg=#465457 guibg=#000000 +hi Function guifg=#cbfe28 +hi Identifier guifg=#ff9900 +hi Ignore guifg=#808080 guibg=bg +hi IncSearch guifg=#c4be89 guibg=#000000 + +hi Keyword guifg=#f92672 gui=bold +hi Label guifg=#e6db74 gui=none +hi Macro guifg=#c4be89 gui=italic +hi SpecialKey guifg=#d3fe36 gui=italic + +hi MatchParen guifg=#000000 guibg=#fd971f gui=bold +hi ModeMsg guifg=#e6db74 +hi MoreMsg guifg=#e6db74 +hi Operator guifg=#6d8fd9 + +" complete menu +hi Pmenu guifg=#66d9ef guibg=#000000 +hi PmenuSel guibg=#808080 +hi PmenuSbar guibg=#080808 +hi PmenuThumb guifg=#66d9ef + +hi PreCondit guifg=#a6e22e gui=bold +hi PreProc guifg=#a6e22e +hi Question guifg=#66d9ef +hi Repeat guifg=#f92672 gui=bold +hi Search guifg=#fffffF guibg=#0099ff +" marks column +hi SignColumn guifg=#a6e22e guibg=#232526 +hi SpecialChar guifg=#f92672 gui=bold +hi SpecialComment guifg=#465457 gui=bold +hi Special guifg=#66d9ef guibg=bg gui=italic +hi SpecialKey guifg=#888A85 gui=italic +if has("spell") + hi SpellBad guisp=#ff0000 gui=undercurl + hi SpellCap guisp=#7070F0 gui=undercurl + hi SpellLocal guisp=#70f0f0 gui=undercurl + hi SpellRare guisp=#ffffff gui=undercurl +endif +hi Statement guifg=#6d8fd9 gui=bold +hi htmlStatement guifg=#99b5d9 +hi StatusLine guifg=#455354 guibg=fg +hi StatusLineNC guifg=#808080 guibg=#080808 +hi StorageClass guifg=#fd971f gui=italic +hi Structure guifg=#66d9ef +hi Tag guifg=#f92672 gui=italic +hi Title guifg=#ef5939 +hi Todo guifg=#ffffff guibg=bg gui=bold + +hi Typedef guifg=#66d9ef +hi Type guifg=#66d9ef gui=none +hi Underlined guifg=#808080 gui=underline + +hi VertSplit guifg=#808080 guibg=#080808 gui=bold +hi VisualNOS guibg=#403d3d +hi Visual guibg=#403d3d +hi WarningMsg guifg=#ffffff guibg=#333333 gui=bold +hi WildMenu guifg=#66d9ef guibg=#000000 + +hi Normal guifg=#f4f4f4 guibg=#070914 +hi Comment guifg=#666666 +hi CursorLine guibg=#293739 +hi CursorColumn guibg=#293739 +hi LineNr guifg=#bcbcbc guibg=#151825 +hi NonText guifg=#151825 guibg=#151825 + +hi LongLineWarning guifg=#960050 guibg=#1e0010 gui=underline + +" +" Support for 256-color terminal +" +if &t_Co > 255 + highlight Boolean cterm=bold ctermfg=141 + highlight Character ctermfg=185 + highlight Number ctermfg=210 + highlight String ctermfg=209 + highlight Conditional ctermfg=214 + highlight Constant cterm=bold ctermfg=191 + highlight Cursor ctermbg=231 ctermfg=16 + highlight Debug cterm=bold ctermfg=250 + highlight Define ctermfg=81 + highlight Delimiter ctermfg=245 + highlight DiffAdd ctermbg=23 + highlight DiffChange ctermbg=239 ctermfg=245 + highlight DiffDelete ctermbg=53 ctermfg=89 + highlight DiffText cterm=bold ctermbg=239 + + highlight Directory cterm=bold ctermfg=112 + highlight Error ctermbg=53 ctermfg=152 + highlight ErrorMsg cterm=bold ctermbg=235 ctermfg=197 + highlight Exception cterm=bold ctermfg=112 + highlight Float ctermfg=141 + highlight FoldColumn ctermbg=31 ctermfg=195 + highlight Folded ctermbg=31 ctermfg=195 + highlight Function ctermfg=154 + highlight Identifier ctermfg=208 + highlight Ignore ctermfg=244 + highlight IncSearch ctermbg=16 ctermfg=186 + + highlight Keyword cterm=bold ctermfg=197 + highlight Label cterm=none ctermfg=185 + highlight Macro ctermfg=186 + highlight SpecialKey ctermfg=191 + + highlight MatchParen cterm=bold ctermbg=208 ctermfg=16 + + highlight MoreMsg ctermfg=185 + highlight Operator cterm=bold ctermfg=33 + + " complete menu + highlight Pmenu ctermbg=16 ctermfg=81 + highlight PmenuSel ctermbg=244 + highlight PmenuSbar ctermbg=232 + highlight PmenuThumb ctermfg=81 + + highlight PreCondit cterm=bold ctermfg=112 + highlight PreProc ctermfg=112 + highlight Question ctermfg=81 + highlight Repeat cterm=bold ctermfg=33 + highlight Search ctermbg=33 ctermfg=231 + " marks column + highlight SignColumn ctermbg=235 ctermfg=112 + highlight SpecialChar cterm=bold ctermfg=197 + highlight SpecialComment cterm=bold ctermfg=240 + highlight Special ctermfg=81 + highlight SpecialKey ctermfg=245 + + if has("spell") + highlight SpellBad cterm=undercurl + highlight SpellCap cterm=undercurl + highlight SpellLocal cterm=undercurl + highlight SpellRare cterm=undercurl + endif + + highlight Statement cterm=bold ctermfg=33 + highlight htmlStatement ctermfg=67 + highlight StatusLine ctermfg=240 + highlight StatusLineNC ctermbg=232 ctermfg=244 + highlight StorageClass ctermfg=208 + highlight Structure ctermfg=81 + highlight Tag ctermfg=197 + highlight Title ctermfg=209 + highlight Todo cterm=bold ctermfg=234 + + highlight Typedef ctermfg=81 + highlight Type cterm=none ctermfg=81 + highlight Underlined cterm=underline ctermfg=244 + + highlight VertSplit cterm=bold ctermbg=232 ctermfg=244 + highlight VisualNOS ctermbg=238 + highlight Visual ctermbg=238 + highlight WarningMsg cterm=bold ctermbg=236 ctermfg=231 + highlight WildMenu ctermbg=16 ctermfg=81 + + highlight Normal ctermbg=17 ctermfg=231 + highlight Comment ctermfg=248 + highlight CursorLine cterm=none ctermbg=237 + highlight CursorColumn ctermbg=237 + highlight LineNr ctermbg=18 ctermfg=250 + highlight NonText ctermbg=18 ctermfg=235 + + highlight LongLineWarning cterm=underline ctermbg=53 ctermfg=152 +end + diff --git a/.vim/colors/fu.vim b/.vim/colors/fu.vim new file mode 100644 index 0000000..2a96dc4 --- /dev/null +++ b/.vim/colors/fu.vim @@ -0,0 +1,121 @@ +" Vim color file +" +" Name: fu.vim +" Version: 1.1 +" Maintainer: Aaron Mueller +" Contributors: Florian Eitel +" Tinou +" +" This is a compositon from railscast, mustang and xoria256 with a lot of +" improvemts in the colors. Want to change toe colors to your needs? Go to +" this page to see what number is set wo what color: +" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html +" +" History: +" 2010-06-09 - Merge changes from Florian Eitel in this file. There was many +" whitespace issues and some unused highlight settings which are removed +" now. Also merged Tinous GUI version of the whole colorscheme. Thanks a +" lot dudes! +" +" 2010-06-09 - Initial setup and creation of this file. Additional colors for +" Ruby and the diff view are added. +" + +if &t_Co != 256 && ! has("gui_running") + echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)" + finish +endif + +set background=dark +hi clear + +if exists("syntax_on") + syntax reset +endif +let colors_name = "fu" + + +" General colors +hi Normal ctermfg=252 ctermbg=234 guifg=#d0d0d0 guibg=#1c1c1c +hi CursorColumn ctermbg=238 guibg=#444444 +hi Cursor ctermbg=214 guibg=#ffaf00 +hi CursorLine ctermbg=238 guibg=#444444 +hi FoldColumn ctermfg=248 ctermbg=bg guifg=#a8a8a8 guibg=#000000 +hi Folded ctermfg=255 ctermbg=60 guifg=#eeeeee guibg=#5f5f87 +hi IncSearch ctermfg=0 ctermbg=223 guifg=#000000 guibg=#ffd7af +hi NonText ctermfg=248 ctermbg=233 cterm=bold guifg=#a8a8a8 guibg=#121212 +hi Search ctermfg=0 ctermbg=149 guifg=#000000 guibg=#afd75f +hi SignColumn ctermfg=248 guifg=#a8a8a8 +hi SpecialKey ctermfg=77 guifg=#5fd75f +hi StatusLine ctermfg=232 ctermbg=255 guifg=#080808 guibg=#eeeeee +hi StatusLineNC ctermfg=237 ctermbg=253 guifg=#3a3a3a guibg=#dadada +hi TabLine ctermfg=253 ctermbg=237 guifg=#dadada guibg=#3a3a3a +hi TabLineFill ctermfg=0 ctermbg=0 guifg=#000000 guibg=#000000 +hi TabLineSel ctermfg=255 ctermbg=33 guifg=#eeeeee guibg=#0087ff +hi VertSplit ctermfg=237 ctermbg=237 guifg=#3a3a3a guibg=#3a3a3a +hi Visual ctermfg=24 ctermbg=153 guifg=#005f87 guibg=#afd7ff +hi VIsualNOS ctermfg=24 ctermbg=153 guifg=#005f87 guibg=#afd7ff +hi LineNr ctermfg=248 ctermbg=232 guifg=#a8a8a8 guibg=#080808 +hi ModeMsg ctermfg=220 guifg=#ffd700 + +hi ErrorMsg ctermfg=196 ctermbg=52 guifg=#ff0000 guibg=#5f0000 +hi SpellBad ctermfg=196 ctermbg=52 + +if version >= 700 + hi CursorLine ctermbg=236 guibg=#303030 + hi CursorColumn ctermbg=236 guibg=#303030 + hi MatchParen ctermfg=157 ctermbg=237 cterm=bold guifg=#afffaf guibg=#3a3a3a + hi Pmenu ctermfg=255 ctermbg=236 guifg=#eeeeee guibg=#303030 + hi PmenuSel ctermfg=0 ctermbg=74 guifg=#000000 guibg=#5fafd7 + hi PmenuSbar ctermbg=243 guibg=#767676 + hi PmenuThumb ctermbg=252 guibg=#d0d0d0 + hi WildMenu ctermfg=255 ctermbg=33 guifg=#eeeeee guibg=#0087ff +endif + +" Syntax highlighting +hi Comment ctermfg=244 guifg=#808080 + +hi Constant ctermfg=220 cterm=bold guifg=#ffd700 +hi String ctermfg=107 ctermbg=233 guifg=#87af5f guibg=#121212 +hi Character ctermfg=228 ctermbg=16 guifg=#ffff87 guibg=#000000 +hi Number ctermfg=214 guifg=#ffaf00 +hi Boolean ctermfg=148 guifg=#afd700 + +hi Identifier ctermfg=149 guifg=#afd75f +hi Function ctermfg=231 guifg=#ffffff + +hi Statement ctermfg=103 guifg=#8787af +hi Conditional ctermfg=105 guifg=#8787ff +hi Repeat ctermfg=105 guifg=#8787ff +hi Label ctermfg=105 guifg=#8787ff +hi Operator ctermfg=243 guifg=#767676 +hi Keyword ctermfg=190 guifg=#d7ff00 +hi Exception ctermfg=166 ctermbg=0 guifg=#d75f00 guibg=#000000 + +hi PreProc ctermfg=229 guifg=#ffffaf + +hi Type ctermfg=111 guifg=#87afff +hi Structure ctermfg=111 ctermbg=233 guifg=#87afff guibg=#121212 + +hi Special ctermfg=220 guifg=#ffd700 +hi SpecialComment ctermfg=228 ctermbg=16 guifg=#ffff87 guibg=#000000 + +hi Error ctermfg=196 ctermbg=52 guifg=#ff0000 guibg=#5f0000 +hi Todo ctermfg=46 ctermbg=22 guifg=#00ff00 guibg=#005f00 + +" Diff +hi diffAdd ctermfg=bg ctermbg=151 guifg=#afd787 +hi diffDelete ctermfg=bg ctermbg=246 guifg=#d78787 +hi diffChange ctermfg=bg ctermbg=181 guifg=#000000 guibg=#afd7af +hi diffText ctermfg=bg ctermbg=174 cterm=bold guifg=#000000 guibg=#949494 + +" Ruby +hi rubyBlockParameter ctermfg=27 guifg=#005fff +hi rubyClass ctermfg=75 guifg=#5fafff +hi rubyConstant ctermfg=167 guifg=#d75f5f +hi rubyInterpolation ctermfg=107 guifg=#87af5f +hi rubyLocalVariableOrMethod ctermfg=189 guifg=#d7d7ff +hi rubyPredefinedConstant ctermfg=167 guifg=#d75f5f +hi rubyPseudoVariable ctermfg=221 guifg=#ffd75f +hi rubyStringDelimiter ctermfg=143 guifg=#afaf5f + diff --git a/.vim/colors/liquidcarbon.vim b/.vim/colors/liquidcarbon.vim new file mode 100644 index 0000000..d5164f1 --- /dev/null +++ b/.vim/colors/liquidcarbon.vim @@ -0,0 +1,126 @@ +" File: liquidcarbon.vim +" Author: Jeet Sukumaran +" Description: Vim color file +" Last Modified: October 06, 2010 + +" Initialization and Setup {{{1 +" ============================================================================ +set background=dark +highlight clear +if exists("syntax_on") + syntax reset +endif +let colors_name = "liquidcarbon" +" 1}}} + +" Normal Color {{{1 +" ============================================================================ +hi Normal guifg=#bdcdcd guibg=#303030 +" 1}}} + +" Core Highlights {{{1 +" ============================================================================ +hi ColorColumn guifg=NONE guibg=#3A3A3A +hi Cursor guifg=bg guibg=fg gui=NONE +hi CursorIM guifg=bg guibg=fg gui=NONE +hi CursorLine guifg=NONE guibg=#303030 gui=NONE +hi lCursor guifg=bg guibg=fg gui=NONE +hi DiffAdd guifg=#000000 guibg=#3cb371 gui=NONE +hi DiffChange guifg=#000000 guibg=#4f94cd gui=NONE +hi DiffDelete guifg=#000000 guibg=#8b3626 gui=NONE +hi DiffText guifg=#000000 guibg=#8ee5ee gui=NONE +hi Directory guifg=#1e90ff guibg=bg gui=NONE +hi ErrorMsg guifg=#ff6a6a guibg=NONE gui=bold +hi FoldColumn guifg=#68838b guibg=#4B4B4B gui=bold +hi Folded guifg=#68838b guibg=#4B4B4B gui=NONE +hi IncSearch guifg=#ffffff guibg=#ff4500 gui=bold +hi LineNr guifg=#767676 guibg=#222222 gui=NONE +hi MatchParen guifg=#fff000 guibg=#000000 gui=bold +hi ModeMsg guifg=#000000 guibg=#00ff00 gui=bold +hi MoreMsg guifg=#2e8b57 guibg=bg gui=bold +hi NonText guifg=#9ac0cd guibg=bg gui=NONE +hi Pmenu guifg=#0000ff guibg=#c0c8cf gui=bold +hi PmenuSel guifg=#c0c8cf guibg=#0000ff gui=bold +hi PmenuSbar guifg=#ffffff guibg=#c1cdc1 gui=NONE +hi PmenuThumb guifg=#ffffff guibg=#838b83 gui=NONE +hi Question guifg=#00ee00 guibg=NONE gui=bold +hi Search guifg=#000000 guibg=#fff68f gui=bold +hi SignColumn guifg=#ffffff guibg=#cdcdb4 gui=NONE +hi SpecialKey guifg=#666666 guibg=NONE gui=NONE +hi SpellBad guisp=#ee2c2c gui=undercurl +hi SpellCap guisp=#0000ff gui=undercurl +hi SpellLocal guisp=#008b8b gui=undercurl +hi SpellRare guisp=#ff00ff gui=undercurl +hi StatusLine guifg=#ddeeff guibg=#445566 gui=NONE +hi StatusLineNC guifg=#999999 guibg=#445566 gui=italic +hi TabLine guifg=fg guibg=#d3d3d3 gui=underline +hi TabLineFill guifg=fg guibg=bg gui=reverse +hi TabLineSel guifg=fg guibg=bg gui=bold +hi Title guifg=#009acd guibg=bg gui=bold +hi VertSplit guifg=#445566 guibg=#445566 +hi Visual guifg=#000000 guibg=#90ccff gui=NONE +hi WarningMsg guifg=#ee9a00 guibg=bg gui=NONE +hi WildMenu guifg=#000000 guibg=#87ceeb gui=NONE +" 1}}} + +" Syntax {{{1 +" ============================================================================ + +" General {{{2 +" ----------------------------------------------------------------------------- +hi Comment guifg=#809090 guibg=NONE gui=italic +hi Constant guifg=#cdad00 guibg=NONE gui=NONE +hi String guifg=#559b70 guibg=NONE gui=NONE +hi Boolean guifg=#cd69c9 guibg=NONE gui=NONE +hi Identifier guifg=#9f79ee guibg=NONE gui=NONE +hi Function guifg=#92a5de guibg=NONE gui=NONE +hi Statement guifg=#009acd guibg=NONE gui=NONE +hi PreProc guifg=#009acd guibg=NONE gui=NONE +hi Keyword guifg=#7ac5cd guibg=NONE gui=NONE +hi Type guifg=#4169e1 guibg=NONE gui=NONE +hi Special guifg=#7f9f44 guibg=NONE gui=NONE +hi Ignore guifg=bg guibg=NONE gui=NONE +hi Error guifg=#ff3030 guibg=NONE gui=underline +hi Todo guifg=#ff88ee guibg=NONE gui=bold +" 2}}} + +" Vim {{{2 +" ----------------------------------------------------------------------------- +hi VimError guifg=#ff0000 guibg=#000000 gui=bold +hi VimCommentTitle guifg=#528b8b guibg=bg gui=bold,italic +" 2}}} + +" QuickFix {{{2 +" ----------------------------------------------------------------------------- +hi qfFileName guifg=#607b8b guibg=NONE gui=italic +hi qfLineNr guifg=#0088aa guibg=NONE gui=bold +hi qfError guifg=#ff0000 guibg=NONE gui=bold +" 2}}} + +" Python {{{2 +" ----------------------------------------------------------------------------- +hi pythonDecorator guifg=#cd8500 guibg=NONE gui=NONE +hi link pythonDecoratorFunction pythonDecorator +" 2}}} + +" Diff {{{2 +" ----------------------------------------------------------------------------- +hi diffOldFile guifg=#da70d6 guibg=NONE gui=italic +hi diffNewFile guifg=#ffff00 guibg=NONE gui=italic +hi diffFile guifg=#ffa500 guibg=NONE gui=italic +hi diffLine guifg=#ff00ff guibg=NONE gui=italic +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=#cd5555 guibg=NONE gui=NONE +hi diffChanged guifg=#4f94cd guibg=NONE gui=NONE +hi diffAdded guifg=#00cd00 guibg=NONE gui=NONE +hi link diffSubname diffLine +hi link diffComment Comment +" 2}}} + +" 1}}} diff --git a/.vim/colors/lucius.vim b/.vim/colors/lucius.vim index 10a53fd..9da8f5b 100644 --- a/.vim/colors/lucius.vim +++ b/.vim/colors/lucius.vim @@ -1,353 +1,771 @@ -" Vim color file -" Maintainer: Jonathan Filip -" Last Modified: Mon Apr 19, 2010 10:24AM -" Version: 3.5 +" ============================================================================ +" Name: Lucius vim color scheme +" Author: Jonathan Filip +" Version: 8.1.4 +" ---------------------------------------------------------------------------- " -" GUI / 256 color terminal +" Light and dark color scheme for GUI and 256 color terminal. " -" I started out trying to combine my favorite parts of other schemes and ended -" up with this (oceandeep, moria, peaksea, wombat, zenburn). +" There are several options available to customize the color scheme to your +" own tastes. This is particularly useful when you have to work in different +" environments at different times (home, work, day, night, etc). " -" This file also tries to have descriptive comments for each higlighting group -" so it is easy to understand what each part does. +" The GUI and 256 color terminal versions of this color scheme are identical. +" +" You can set up the color scheme by manually setting the options you want or +" by choosing one of the presets defined. These presets are loaded after you +" first source the color scheme file and are all commands that start with +" 'Lucius'. +" +" I have also started to create color schemes for different applications. I +" have been using them for PuTTY, iTerm2, and Visual Studio, but will keep +" adding more as I go along. You can find the files for these on Github: +" +" https://github.com/jonathanfilip/lucius +" +" You can also clone the following repository if you use Pathogen or something +" similar. It holds the vim color scheme in a 'colors' directory: +" +" https://github.com/jonathanfilip/vim-lucius +" +" +" +" Presets: +" +" There are several presets available that will set all the options for you. +" There are screenshots of each preset below: +" +" * LuciusDark (dark default): http://i.imgur.com/LsZbF.png +" * LuciusDarkHighContrast: http://i.imgur.com/e70i9.png +" * LuciusDarkLowContrast: http://i.imgur.com/Hmw8s.png +" * LuciusBlack: http://i.imgur.com/iD4ri.png +" * LuciusBlackHighContrast: http://i.imgur.com/lHvTJ.png +" * LuciusBlackLowContrast: http://i.imgur.com/oZLkg.png +" +" * LuciusLight (light default): http://i.imgur.com/soYD8.png +" * LuciusLightLowContrast: http://i.imgur.com/95I86.png +" * LuciusWhite: http://i.imgur.com/wDzkz.png +" * LuciusWhiteLowContrast: http://i.imgur.com/jlUf4.png +" +" To use the presets, you just need to set the color scheme first. In your +" vimrc, you can just do this: +" +" colorscheme lucius +" LuciusBlack +" +" You can still just set the background variable and then set the color +" scheme. This will default to LuciusDark for 'dark' and LuciusLight for +" 'light'. +" +" +" Options: +" +" The presets available cover most of the options. You can, however, customize +" things by setting the following variables yourself: +" +" g:lucius_style (default: 'dark') +" +" Set this option to either 'light' or 'dark' for your desired color scheme. +" It has the same effect as setting the background. +" +" g:lucius_contrast (default: 'normal') +" +" This option determines the contrast to use for text/ui elements. It can be +" set to 'low', 'normal', or 'high'. At this time there is no 'high' for the +" light scheme. +" +" g:lucius_contrast_bg (default: 'normal') +" +" Setting this option makes the background a higher contrast. Current settings +" are 'normal' and 'high'. +" +" g:lucius_use_bold (default: 1) +" +" Setting this will cause the color scheme to use bold fonts for some items. +" +" g:lucius_use_underline (default: 1) +" +" Setting this will cause the color scheme to use underlined fonts for some +" items. +" +" g:lucius_no_term_bg (default: 0) +" +" Setting this will cause the color scheme to not set a background color in +" the terminal (useful for transparency or terminals with different background +" colors). +" +" ============================================================================ + + +" ============================================================================ +" Options: +" ============================================================================ -set background=dark +unlet! g:colors_name hi clear if exists("syntax_on") syntax reset endif -let colors_name="lucius" - -" Some other colors to save -" blue: 3eb8e5 -" green: 92d400 -" c green: d5f876, cae682 -" new blue: 002D62 -" new gray: CCCCCC - - -" Base color -" ---------- -hi Normal guifg=#e0e0e0 guibg=#202020 -hi Normal ctermfg=253 ctermbg=235 - - -" Comment Group -" ------------- -" any comment -hi Comment guifg=#606060 gui=none -hi Comment ctermfg=240 cterm=none - - -" Constant Group -" -------------- -" any constant -hi Constant guifg=#8cd0d3 gui=none -hi Constant ctermfg=116 cterm=none -" strings -hi String guifg=#80c0d9 gui=none -hi String ctermfg=110 cterm=none -" character constant -hi Character guifg=#80c0d9 gui=none -hi Character ctermfg=110 cterm=none -" numbers decimal/hex -hi Number guifg=#8cd0d3 gui=none -hi Number ctermfg=116 cterm=none -" true, false -hi Boolean guifg=#8cd0d3 gui=none -hi Boolean ctermfg=116 cterm=none -" float -hi Float guifg=#8cd0d3 gui=none -hi Float ctermfg=116 cterm=none - - -" Identifier Group -" ---------------- -" any variable name -hi Identifier guifg=#e6c080 gui=none -hi Identifier ctermfg=180 cterm=none -" function, method, class -hi Function guifg=#e6c080 gui=none -hi Function ctermfg=180 cterm=none - - -" Statement Group -" --------------- -" any statement -hi Statement guifg=#b3d38c gui=none -hi Statement ctermfg=150 cterm=none -" if, then, else -hi Conditional guifg=#b3d38c gui=none -hi Conditional ctermfg=150 cterm=none -" try, catch, throw, raise -hi Exception guifg=#b3d38c gui=none -hi Exception ctermfg=150 cterm=none -" for, while, do -hi Repeat guifg=#b3d38c gui=none -hi Repeat ctermfg=150 cterm=none -" case, default -hi Label guifg=#b3d38c gui=none -hi Label ctermfg=150 cterm=none -" sizeof, +, * -hi Operator guifg=#b3d38c gui=none -hi Operator ctermfg=150 cterm=none -" any other keyword -hi Keyword guifg=#b3d38c gui=none -hi Keyword ctermfg=150 cterm=none - - -" Preprocessor Group -" ------------------ -" generic preprocessor -hi PreProc guifg=#e9dfaf gui=none -hi PreProc ctermfg=187 cterm=none -" #include -hi Include guifg=#e9dfaf gui=none -hi Include ctermfg=187 cterm=none -" #define -hi Define guifg=#e9dfaf gui=none -hi Define ctermfg=187 cterm=none -" same as define -hi Macro guifg=#e9dfaf gui=none -hi Macro ctermfg=187 cterm=none -" #if, #else, #endif -hi PreCondit guifg=#e9dfaf gui=none -hi PreCondit ctermfg=187 cterm=none - - -" Type Group -" ---------- -" int, long, char -hi Type guifg=#93d6a9 gui=none -hi Type ctermfg=115 cterm=none -" static, register, volative -hi StorageClass guifg=#93d6a9 gui=none -hi StorageClass ctermfg=115 cterm=none -" struct, union, enum -hi Structure guifg=#93d6a9 gui=none -hi Structure ctermfg=115 cterm=none -" typedef -hi Typedef guifg=#93d6a9 gui=none -hi Typedef ctermfg=115 cterm=none - - -" Special Group -" ------------- -" any special symbol -hi Special guifg=#cca3b3 gui=none -hi Special ctermfg=181 cterm=none -" special character in a constant -hi SpecialChar guifg=#cca3b3 gui=none -hi SpecialChar ctermfg=181 cterm=none -" things you can CTRL-] -hi Tag guifg=#cca3b3 gui=none -hi Tag ctermfg=181 cterm=none -" character that needs attention -hi Delimiter guifg=#cca3b3 gui=none -hi Delimiter ctermfg=181 cterm=none -" special things inside a comment -hi SpecialComment guifg=#cca3b3 gui=none -hi SpecialComment ctermfg=181 cterm=none -" debugging statements -hi Debug guifg=#cca3b3 guibg=NONE gui=none -hi Debug ctermfg=181 ctermbg=NONE cterm=none - - -" Underlined Group -" ---------------- -" text that stands out, html links -hi Underlined guifg=fg gui=underline -hi Underlined ctermfg=fg cterm=underline - - -" Ignore Group -" ------------ -" left blank, hidden -hi Ignore guifg=bg -hi Ignore ctermfg=bg - - -" Error Group -" ----------- -" any erroneous construct -hi Error guifg=#e37170 guibg=#432323 gui=none -hi Error ctermfg=167 ctermbg=52 cterm=none - - -" Todo Group -" ---------- -" todo, fixme, note, xxx -hi Todo guifg=#efef8f guibg=NONE gui=underline -hi Todo ctermfg=228 ctermbg=NONE cterm=underline - - -" Spelling -" -------- -" word not recognized -hi SpellBad guisp=#ee0000 gui=undercurl -hi SpellBad ctermbg=196 cterm=undercurl -" word not capitalized -hi SpellCap guisp=#eeee00 gui=undercurl -hi SpellCap ctermbg=226 cterm=undercurl -" rare word -hi SpellRare guisp=#ffa500 gui=undercurl -hi SpellRare ctermbg=214 cterm=undercurl -" wrong spelling for selected region -hi SpellLocal guisp=#ffa500 gui=undercurl -hi SpellLocal ctermbg=214 cterm=undercurl - - -" Cursor -" ------ -" character under the cursor -hi Cursor guifg=bg guibg=#a3e3ed -hi Cursor ctermfg=bg ctermbg=153 -" like cursor, but used when in IME mode -hi CursorIM guifg=bg guibg=#96cdcd -hi CursorIM ctermfg=bg ctermbg=116 -" cursor column -hi CursorColumn guifg=NONE guibg=#404448 gui=none -hi CursorColumn ctermfg=NONE ctermbg=236 cterm=none -" cursor line/row -hi CursorLine gui=NONE guibg=#404448 gui=none -hi CursorLine cterm=NONE ctermbg=236 cterm=none - - -" Misc -" ---- -" directory names and other special names in listings -hi Directory guifg=#c0e0b0 gui=none -hi Directory ctermfg=151 cterm=none -" error messages on the command line -hi ErrorMsg guifg=#ee0000 guibg=NONE gui=none -hi ErrorMsg ctermfg=196 ctermbg=NONE cterm=none -" column separating vertically split windows -hi VertSplit guifg=#777777 guibg=#363946 gui=none -hi VertSplit ctermfg=242 ctermbg=237 cterm=none -" columns where signs are displayed (used in IDEs) -hi SignColumn guifg=#9fafaf guibg=#181818 gui=none -hi SignColumn ctermfg=145 ctermbg=233 cterm=none -" line numbers -hi LineNr guifg=#818698 guibg=#363946 -hi LineNr ctermfg=245 ctermbg=237 -" match parenthesis, brackets -hi MatchParen guifg=#00ff00 guibg=NONE gui=bold -hi MatchParen ctermfg=46 ctermbg=NONE cterm=bold -" the 'more' prompt when output takes more than one line -hi MoreMsg guifg=#2e8b57 gui=none -hi MoreMsg ctermfg=29 cterm=none -" text showing what mode you are in -hi ModeMsg guifg=#76d5f8 guibg=NONE gui=none -hi ModeMsg ctermfg=117 ctermbg=NONE cterm=none -" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line -hi NonText guifg=#404040 gui=none -hi NonText ctermfg=238 cterm=none -" the hit-enter prompt (show more output) and yes/no questions -hi Question guifg=fg gui=none -hi Question ctermfg=fg cterm=none -" meta and special keys used with map, unprintable characters -hi SpecialKey guifg=#405060 -hi SpecialKey ctermfg=239 -" titles for output from :set all, :autocmd, etc -hi Title guifg=#62bdde gui=none -hi Title ctermfg=74 cterm=none -"hi Title guifg=#5ec8e5 gui=none -" warning messages -hi WarningMsg guifg=#e5786d gui=none -hi WarningMsg ctermfg=173 cterm=none -" current match in the wildmenu completion -hi WildMenu guifg=#cae682 guibg=#363946 gui=bold,underline -hi WildMenu ctermfg=16 ctermbg=186 cterm=bold -" color column highlighting -hi ColorColumn guifg=NONE guibg=#403630 gui=none -hi ColorColumn ctermfg=NONE ctermbg=94 cterm=none - - -" Diff -" ---- -" added line -hi DiffAdd guifg=#80a090 guibg=#313c36 gui=none -hi DiffAdd ctermfg=fg ctermbg=22 cterm=none -" changed line -hi DiffChange guifg=NONE guibg=#4a343a gui=none -hi DiffChange ctermfg=fg ctermbg=52 cterm=none -" deleted line -hi DiffDelete guifg=#6c6661 guibg=#3c3631 gui=none -hi DiffDelete ctermfg=fg ctermbg=58 cterm=none -" changed text within line -hi DiffText guifg=#f05060 guibg=#4a343a gui=bold -hi DiffText ctermfg=203 ctermbg=52 cterm=bold - - -" Folds -" ----- -" line used for closed folds -"hi Folded guifg=#91d6f8 guibg=#363946 gui=none -"hi Folded ctermfg=117 ctermbg=238 cterm=none -hi Folded guifg=#d0e0f0 guibg=#202020 gui=none -hi Folded ctermfg=117 ctermbg=235 cterm=none -" column on side used to indicated open and closed folds -hi FoldColumn guifg=#91d6f8 guibg=#363946 gui=none -hi FoldColumn guifg=#c0c0d0 guibg=#363946 gui=none -hi FoldColumn ctermfg=117 ctermbg=238 cterm=none - - -" Search -" ------ -" highlight incremental search text; also highlight text replaced with :s///c -hi IncSearch guifg=#66ffff gui=reverse -hi IncSearch ctermfg=87 cterm=reverse -" hlsearch (last search pattern), also used for quickfix -hi Search guibg=#ffaa33 gui=none -hi Search ctermbg=214 cterm=none - - -" Popup Menu -" ---------- -" normal item in popup -hi Pmenu guifg=#e0e0e0 guibg=#303840 gui=none -hi Pmenu ctermfg=253 ctermbg=233 cterm=none -" selected item in popup -hi PmenuSel guifg=#cae682 guibg=#505860 gui=none -hi PmenuSel ctermfg=186 ctermbg=237 cterm=none -" scrollbar in popup -hi PMenuSbar guibg=#505860 gui=none -hi PMenuSbar ctermbg=59 cterm=none -" thumb of the scrollbar in the popup -hi PMenuThumb guibg=#808890 gui=none -hi PMenuThumb ctermbg=102 cterm=none - - -" Status Line -" ----------- -" status line for current window -hi StatusLine guifg=#e0e0e0 guibg=#363946 gui=bold -hi StatusLine ctermfg=254 ctermbg=237 cterm=bold -" status line for non-current windows -hi StatusLineNC guifg=#767986 guibg=#363946 gui=none -hi StatusLineNC ctermfg=244 ctermbg=237 cterm=none - - -" Tab Lines -" --------- -" tab pages line, not active tab page label -hi TabLine guifg=#b6bf98 guibg=#363946 gui=none -hi TabLine ctermfg=244 ctermbg=236 cterm=none -" tab pages line, where there are no labels -hi TabLineFill guifg=#cfcfaf guibg=#363946 gui=none -hi TabLineFill ctermfg=187 ctermbg=236 cterm=none -" tab pages line, active tab page label -hi TabLineSel guifg=#efefef guibg=#414658 gui=bold -hi TabLineSel ctermfg=254 ctermbg=236 cterm=bold - - -" Visual -" ------ -" visual mode selection -hi Visual guifg=NONE guibg=#364458 -hi Visual ctermfg=NONE ctermbg=24 -" visual mode selection when vim is not owning the selection (x11 only) -hi VisualNOS guifg=fg gui=underline -hi VisualNOS ctermfg=fg cterm=underline + +if exists("g:lucius_style") + let s:style = g:lucius_style +else + let s:style = &background +endif + +if exists("g:lucius_contrast") + let s:contrast = g:lucius_contrast +else + let s:contrast = "normal" +endif + +if exists("g:lucius_contrast_bg") + let s:contrast_bg = g:lucius_contrast_bg +else + let s:contrast_bg = "normal" +endif + +if exists("g:lucius_use_bold") + let s:use_bold = g:lucius_use_bold +else + let s:use_bold = 1 +endif + +if exists("g:lucius_use_underline") + let s:use_underline = g:lucius_use_underline +else + let s:use_underline = 1 +endif + +if exists("g:lucius_no_term_bg") + let s:no_term_bg = g:lucius_no_term_bg +else + let s:no_term_bg = 0 +endif + + +" ============================================================================ +" Color Map: +" ============================================================================ + +let s:color_map = { + \ 'bg': 'bg', 'fg': 'fg', 'NONE': 'NONE', + \ '#000000': '16', '#00005f': '17', '#000087': '18', '#0000af': '19', + \ '#0000d7': '20', '#0000ff': '21', '#005f00': '22', '#005f5f': '23', + \ '#005f87': '24', '#005faf': '25', '#005fd7': '26', '#005fff': '27', + \ '#008700': '28', '#00875f': '29', '#008787': '30', '#0087af': '31', + \ '#0087d7': '32', '#0087ff': '33', '#00af00': '34', '#00af5f': '35', + \ '#00af87': '36', '#00afaf': '37', '#00afd7': '38', '#00afff': '39', + \ '#00d700': '40', '#00d75f': '41', '#00d787': '42', '#00d7af': '43', + \ '#00d7d7': '44', '#00d7ff': '45', '#00ff00': '46', '#00ff5f': '47', + \ '#00ff87': '48', '#00ffaf': '49', '#00ffd7': '50', '#00ffff': '51', + \ '#5f0000': '52', '#5f005f': '53', '#5f0087': '54', '#5f00af': '55', + \ '#5f00d7': '56', '#5f00ff': '57', '#5f5f00': '58', '#5f5f5f': '59', + \ '#5f5f87': '60', '#5f5faf': '61', '#5f5fd7': '62', '#5f5fff': '63', + \ '#5f8700': '64', '#5f875f': '65', '#5f8787': '66', '#5f87af': '67', + \ '#5f87d7': '68', '#5f87ff': '69', '#5faf00': '70', '#5faf5f': '71', + \ '#5faf87': '72', '#5fafaf': '73', '#5fafd7': '74', '#5fafff': '75', + \ '#5fd700': '76', '#5fd75f': '77', '#5fd787': '78', '#5fd7af': '79', + \ '#5fd7d7': '80', '#5fd7ff': '81', '#5fff00': '82', '#5fff5f': '83', + \ '#5fff87': '84', '#5fffaf': '85', '#5fffd7': '86', '#5fffff': '87', + \ '#870000': '88', '#87005f': '89', '#870087': '90', '#8700af': '91', + \ '#8700d7': '92', '#8700ff': '93', '#875f00': '94', '#875f5f': '95', + \ '#875f87': '96', '#875faf': '97', '#875fd7': '98', '#875fff': '99', + \ '#878700': '100', '#87875f': '101', '#878787': '102', '#8787af': '103', + \ '#8787d7': '104', '#8787ff': '105', '#87af00': '106', '#87af5f': '107', + \ '#87af87': '108', '#87afaf': '109', '#87afd7': '110', '#87afff': '111', + \ '#87d700': '112', '#87d75f': '113', '#87d787': '114', '#87d7af': '115', + \ '#87d7d7': '116', '#87d7ff': '117', '#87ff00': '118', '#87ff5f': '119', + \ '#87ff87': '120', '#87ffaf': '121', '#87ffd7': '122', '#87ffff': '123', + \ '#af0000': '124', '#af005f': '125', '#af0087': '126', '#af00af': '127', + \ '#af00d7': '128', '#af00ff': '129', '#af5f00': '130', '#af5f5f': '131', + \ '#af5f87': '132', '#af5faf': '133', '#af5fd7': '134', '#af5fff': '135', + \ '#af8700': '136', '#af875f': '137', '#af8787': '138', '#af87af': '139', + \ '#af87d7': '140', '#af87ff': '141', '#afaf00': '142', '#afaf5f': '143', + \ '#afaf87': '144', '#afafaf': '145', '#afafd7': '146', '#afafff': '147', + \ '#afd700': '148', '#afd75f': '149', '#afd787': '150', '#afd7af': '151', + \ '#afd7d7': '152', '#afd7ff': '153', '#afff00': '154', '#afff5f': '155', + \ '#afff87': '156', '#afffaf': '157', '#afffd7': '158', '#afffff': '159', + \ '#d70000': '160', '#d7005f': '161', '#d70087': '162', '#d700af': '163', + \ '#d700d7': '164', '#d700ff': '165', '#d75f00': '166', '#d75f5f': '167', + \ '#d75f87': '168', '#d75faf': '169', '#d75fd7': '170', '#d75fff': '171', + \ '#d78700': '172', '#d7875f': '173', '#d78787': '174', '#d787af': '175', + \ '#d787d7': '176', '#d787ff': '177', '#d7af00': '178', '#d7af5f': '179', + \ '#d7af87': '180', '#d7afaf': '181', '#d7afd7': '182', '#d7afff': '183', + \ '#d7d700': '184', '#d7d75f': '185', '#d7d787': '186', '#d7d7af': '187', + \ '#d7d7d7': '188', '#d7d7ff': '189', '#d7ff00': '190', '#d7ff5f': '191', + \ '#d7ff87': '192', '#d7ffaf': '193', '#d7ffd7': '194', '#d7ffff': '195', + \ '#ff0000': '196', '#ff005f': '197', '#ff0087': '198', '#ff00af': '199', + \ '#ff00d7': '200', '#ff00ff': '201', '#ff5f00': '202', '#ff5f5f': '203', + \ '#ff5f87': '204', '#ff5faf': '205', '#ff5fd7': '206', '#ff5fff': '207', + \ '#ff8700': '208', '#ff875f': '209', '#ff8787': '210', '#ff87af': '211', + \ '#ff87d7': '212', '#ff87ff': '213', '#ffaf00': '214', '#ffaf5f': '215', + \ '#ffaf87': '216', '#ffafaf': '217', '#ffafd7': '218', '#ffafff': '219', + \ '#ffd700': '220', '#ffd75f': '221', '#ffd787': '222', '#ffd7af': '223', + \ '#ffd7d7': '224', '#ffd7ff': '225', '#ffff00': '226', '#ffff5f': '227', + \ '#ffff87': '228', '#ffffaf': '229', '#ffffd7': '230', '#ffffff': '231', + \ '#080808': '232', '#121212': '233', '#1c1c1c': '234', '#262626': '235', + \ '#303030': '236', '#3a3a3a': '237', '#444444': '238', '#4e4e4e': '239', + \ '#585858': '240', '#626262': '241', '#6c6c6c': '242', '#767676': '243', + \ '#808080': '244', '#8a8a8a': '245', '#949494': '246', '#9e9e9e': '247', + \ '#a8a8a8': '248', '#b2b2b2': '249', '#bcbcbc': '250', '#c6c6c6': '251', + \ '#d0d0d0': '252', '#dadada': '253', '#e4e4e4': '254', '#eeeeee': '255', + \ } + + +" ============================================================================ +" Functions: +" ============================================================================ + +function! s:AddCterm(name) + exec "let l:gfg = synIDattr(synIDtrans(hlID('" . a:name . + \ "')), 'fg', 'gui')" + exec "let l:gbg = synIDattr(synIDtrans(hlID('" . a:name . + \ "')), 'bg', 'gui')" + let l:gfg = l:gfg == "" ? "NONE" : l:gfg + let l:gbg = l:gbg == "" ? "NONE" : l:gbg + exec "hi " . a:name . " ctermfg=" . s:color_map[l:gfg] . + \ " ctermbg=" . s:color_map[l:gbg] +endfunction + +function! s:AddSpCterm(name) + exec "let l:gsp = synIDattr(synIDtrans(hlID('" . a:name . + \ "')), 'sp', 'gui')" + let l:gsp = l:gsp == "" ? "NONE" : l:gsp + exec "hi " . a:name . " ctermfg=" . s:color_map[l:gsp] +endfunction + + +" ============================================================================ +" Text Groups: +" ============================================================================ + +let s:normal_items = [ + \ "ColorColumn", "Comment", "Constant", "Cursor", "CursorColumn", + \ "CursorIM", "CursorLine", "CursorLineNr", "DiffAdd", "DiffChange", + \ "DiffDelete", "Directory", "Error", "ErrorMsg", "Identifier", + \ "IncSearch", "LineNr", "MatchParen", "ModeMsg", "MoreMsg", + \ "NonText", "Pmenu", "PmenuSbar", "PmenuSel", + \ "PmenuThumb", "PreProc", "Question", "Search", "SignColumn", + \ "Special", "SpecialKey", "Statement", "StatusLineNC", "TabLine", + \ "TabLineFill", "Todo", "Type", "VertSplit", "Visual", + \ "WarningMsg", "WildMenu", + \ ] + +let s:bold_items = [ + \ "DiffText", "FoldColumn", "Folded", "StatusLine", "TabLineSel", + \ "Title", + \ ] + +let s:underline_items = [ + \ "Underlined", "VisualNOS" + \ ] + +let s:undercurl_items = [ + \ "SpellBad", "SpellCap", "SpellLocal", "SpellRare" + \ ] + + +" ============================================================================ +" Color Definitions: +" ============================================================================ + +" ---------------------------------------------------------------------------- +" 'Normal' Colors: +" ---------------------------------------------------------------------------- + +hi clear Normal +hi Normal gui=none cterm=none term=none + +if s:style == "light" + if s:contrast == "high" + hi Normal guifg=#000000 + elseif s:contrast == "low" + hi Normal guifg=#626262 + else + hi Normal guifg=#444444 + endif +else + if s:contrast == "high" + hi Normal guifg=#eeeeee + elseif s:contrast == "low" + hi Normal guifg=#bcbcbc + else + hi Normal guifg=#d7d7d7 + endif +endif + +if s:style == "light" + if s:contrast_bg == "high" + hi Normal guibg=#ffffff + else + hi Normal guibg=#eeeeee + endif +else + if s:contrast_bg == "high" + hi Normal guibg=#121212 + else + hi Normal guibg=#303030 + endif +endif + +call s:AddCterm("Normal") + + +" ---------------------------------------------------------------------------- +" Extra setup +" ---------------------------------------------------------------------------- + +exec "set background=" . s:style + +" Clear default settings +for s:item in s:normal_items + s:bold_items + s:underline_items + s:undercurl_items + exec "hi " . s:item . " guifg=NONE guibg=NONE gui=none" + \ . " ctermfg=NONE ctermbg=NONE cterm=none term=none" +endfor + +let g:colors_name="lucius" + + +" ---------------------------------------------------------------------------- +" Text Markup: +" ---------------------------------------------------------------------------- + +hi ModeMsg guifg=fg +hi Question guifg=fg +if s:style == "light" + hi NonText guifg=#afafd7 + hi SpecialKey guifg=#afd7af + if s:contrast == "low" + hi Comment guifg=#9e9e9e + hi Constant guifg=#d78700 + hi Directory guifg=#00af87 + hi Identifier guifg=#00af00 + hi PreProc guifg=#00afaf + hi Special guifg=#af00af + hi Statement guifg=#0087d7 + hi Title guifg=#0087d7 + hi Type guifg=#0087af + else + hi Comment guifg=#808080 + hi Constant guifg=#af5f00 + hi Directory guifg=#00875f + hi Identifier guifg=#008700 + hi PreProc guifg=#008787 + hi Special guifg=#870087 + hi Statement guifg=#005faf + hi Title guifg=#005faf + hi Type guifg=#005f87 + endif +else + hi NonText guifg=#5f875f + hi SpecialKey guifg=#5f5f87 + if s:contrast == "low" + hi Comment guifg=#6c6c6c + hi Constant guifg=#afaf87 + hi Directory guifg=#87af87 + hi Identifier guifg=#87af5f + hi PreProc guifg=#5faf87 + hi Special guifg=#af87af + hi Statement guifg=#5fafd7 + hi Title guifg=#00afd7 + hi Type guifg=#5fafaf + elseif s:contrast == "high" + hi Comment guifg=#8a8a8a + hi Constant guifg=#ffffd7 + hi Directory guifg=#d7ffd7 + hi Identifier guifg=#d7ffaf + hi PreProc guifg=#afffd7 + hi Special guifg=#ffd7ff + hi Statement guifg=#afffff + hi Title guifg=#87d7ff + hi Type guifg=#afffff + else + hi Comment guifg=#808080 + hi Constant guifg=#d7d7af + hi Directory guifg=#afd7af + hi Identifier guifg=#afd787 + hi PreProc guifg=#87d7af + hi Special guifg=#d7afd7 + hi Statement guifg=#87d7ff + hi Title guifg=#5fafd7 + hi Type guifg=#87d7d7 + endif +endif + + +" ---------------------------------------------------------------------------- +" Highlighting: +" ---------------------------------------------------------------------------- + +hi Cursor guifg=bg +hi CursorColumn guifg=NONE +hi CursorIM guifg=bg +hi CursorLine guifg=NONE +hi Visual guifg=NONE +hi VisualNOS guifg=fg guibg=NONE +if s:style == "light" + hi CursorColumn guibg=#dadada + hi CursorLine guibg=#dadada + hi IncSearch guifg=fg guibg=#5fd7d7 + hi MatchParen guifg=NONE guibg=#5fd7d7 + hi Search guifg=fg guibg=#ffaf00 + hi Visual guibg=#afd7ff + if s:contrast == "low" + hi Cursor guibg=#87afd7 + hi CursorIM guibg=#87afd7 + hi Error guifg=#d70000 guibg=#ffd7d7 + hi Todo guifg=#af8700 guibg=#ffffaf + else + hi Cursor guibg=#5f87af + hi CursorIM guibg=#5f87af + hi Error guifg=#af0000 guibg=#d7afaf + hi Todo guifg=#875f00 guibg=#ffffaf + endif +else + hi CursorColumn guibg=#444444 + hi CursorLine guibg=#444444 + hi IncSearch guifg=bg + hi MatchParen guifg=bg + hi Search guifg=bg + hi Visual guibg=#005f87 + if s:contrast == "low" + hi Cursor guibg=#5f87af + hi CursorIM guibg=#5f87af + hi Error guifg=#d75f5f guibg=#870000 + hi IncSearch guibg=#00afaf + hi MatchParen guibg=#87af5f + hi Search guibg=#d78700 + hi Todo guifg=#afaf00 guibg=#5f5f00 + elseif s:contrast == "high" + hi Cursor guibg=#afd7ff + hi CursorIM guibg=#afd7ff + hi Error guifg=#ffafaf guibg=#af0000 + hi IncSearch guibg=#87ffff + hi MatchParen guibg=#d7ff87 + hi Search guibg=#ffaf5f + hi Todo guifg=#ffff87 guibg=#87875f + else + hi Cursor guibg=#87afd7 + hi CursorIM guibg=#87afd7 + hi Error guifg=#ff8787 guibg=#870000 + hi IncSearch guibg=#5fd7d7 + hi MatchParen guibg=#afd75f + hi Search guibg=#d78700 + hi Todo guifg=#d7d75f guibg=#5f5f00 + endif +endif + + +" ---------------------------------------------------------------------------- +" Messages: +" ---------------------------------------------------------------------------- + +hi ModeMsg guifg=fg +hi Question guifg=fg +if s:style == "light" + if s:contrast == "low" + hi ErrorMsg guifg=#d70000 + hi MoreMsg guifg=#0087ff + hi WarningMsg guifg=#d78700 + else + hi ErrorMsg guifg=#af0000 + hi MoreMsg guifg=#005fd7 + hi WarningMsg guifg=#af5f00 + endif +else + if s:contrast == "low" + hi ErrorMsg guifg=#d75f5f + hi MoreMsg guifg=#00afaf + hi WarningMsg guifg=#af875f + elseif s:contrast == "high" + hi ErrorMsg guifg=#ff8787 + hi MoreMsg guifg=#87ffff + hi WarningMsg guifg=#ffaf87 + else + hi ErrorMsg guifg=#ff5f5f + hi MoreMsg guifg=#5fd7d7 + hi WarningMsg guifg=#d7875f + endif +endif + + +" ---------------------------------------------------------------------------- +" UI: +" ---------------------------------------------------------------------------- + +hi ColorColumn guifg=NONE +hi Pmenu guifg=bg +hi PmenuSel guifg=fg +hi PmenuThumb guifg=fg +hi StatusLine guifg=bg +hi TabLine guifg=bg +hi TabLineSel guifg=fg +hi WildMenu guifg=fg +if s:style == "light" + hi ColorColumn guibg=#e4e4e4 + hi CursorLineNr guifg=#9e9e9e guibg=#dadada + hi FoldColumn guibg=#bcbcbc + hi Folded guibg=#bcbcbc + hi LineNr guifg=#9e9e9e guibg=#dadada + hi PmenuSel guibg=#afd7ff + hi SignColumn guibg=#d0d0d0 + hi StatusLineNC guifg=#e4e4e4 + hi TabLineFill guifg=#b2b2b2 + hi VertSplit guifg=#e4e4e4 + hi WildMenu guibg=#afd7ff + if s:contrast == "low" + hi FoldColumn guifg=#808080 + hi Folded guifg=#808080 + hi Pmenu guibg=#9e9e9e + hi PmenuSbar guifg=#9e9e9e guibg=#626262 + hi PmenuThumb guibg=#9e9e9e + hi SignColumn guifg=#808080 + hi StatusLine guibg=#9e9e9e + hi StatusLineNC guibg=#9e9e9e + hi TabLine guibg=#9e9e9e + hi TabLineFill guibg=#9e9e9e + hi TabLineSel guibg=#afd7ff + hi VertSplit guibg=#9e9e9e + else + hi FoldColumn guifg=#626262 + hi Folded guifg=#626262 + hi Pmenu guibg=#808080 + hi PmenuSbar guifg=#808080 guibg=#444444 + hi PmenuThumb guibg=#9e9e9e + hi SignColumn guifg=#626262 + hi StatusLine guibg=#808080 + hi StatusLineNC guibg=#808080 + hi TabLine guibg=#808080 + hi TabLineFill guibg=#808080 + hi TabLineSel guibg=#afd7ff + hi VertSplit guibg=#808080 + endif +else + hi ColorColumn guibg=#3a3a3a + hi CursorLineNr guifg=#626262 guibg=#444444 + hi FoldColumn guibg=#4e4e4e + hi Folded guibg=#4e4e4e + hi LineNr guifg=#626262 guibg=#444444 + hi PmenuSel guibg=#005f87 + hi SignColumn guibg=#4e4e4e + hi StatusLineNC guifg=#444444 + hi TabLineFill guifg=#444444 + hi VertSplit guifg=#626262 + hi WildMenu guibg=#005f87 + if s:contrast == "low" + hi FoldColumn guifg=#a8a8a8 + hi Folded guifg=#a8a8a8 + hi Pmenu guibg=#8a8a8a + hi PmenuSbar guifg=#8a8a8a guibg=#bcbcbc + hi PmenuThumb guibg=#585858 + hi SignColumn guifg=#8a8a8a + hi StatusLine guibg=#8a8a8a + hi StatusLineNC guibg=#8a8a8a + hi TabLine guibg=#8a8a8a + hi TabLineFill guibg=#8a8a8a + hi TabLineSel guibg=#005f87 + hi VertSplit guibg=#8a8a8a + elseif s:contrast == "high" + hi FoldColumn guifg=#c6c6c6 + hi Folded guifg=#c6c6c6 + hi Pmenu guibg=#bcbcbc + hi PmenuSbar guifg=#bcbcbc guibg=#dadada + hi PmenuThumb guibg=#8a8a8a + hi SignColumn guifg=#bcbcbc + hi StatusLine guibg=#bcbcbc + hi StatusLineNC guibg=#bcbcbc + hi TabLine guibg=#bcbcbc + hi TabLineFill guibg=#bcbcbc + hi TabLineSel guibg=#0087af + hi VertSplit guibg=#bcbcbc + else + hi FoldColumn guifg=#bcbcbc + hi Folded guifg=#bcbcbc + hi Pmenu guibg=#b2b2b2 + hi PmenuSbar guifg=#b2b2b2 guibg=#d0d0d0 + hi PmenuThumb guibg=#808080 + hi SignColumn guifg=#b2b2b2 + hi StatusLine guibg=#b2b2b2 + hi StatusLineNC guibg=#b2b2b2 + hi TabLine guibg=#b2b2b2 + hi TabLineFill guibg=#b2b2b2 + hi TabLineSel guibg=#005f87 + hi VertSplit guibg=#b2b2b2 + endif +endif + + +" ---------------------------------------------------------------------------- +" Diff: +" ---------------------------------------------------------------------------- + +hi DiffAdd guifg=fg +hi DiffChange guifg=fg +hi DiffDelete guifg=fg + +if s:style == "light" + hi DiffAdd guibg=#afd7af + hi DiffChange guibg=#d7d7af + hi DiffDelete guibg=#d7afaf + hi DiffText guibg=#d7d7af + if s:contrast == "low" + hi DiffText guifg=#ff8700 + else + hi DiffText guifg=#d75f00 + endif +else + hi DiffAdd guibg=#5f875f + hi DiffChange guibg=#87875f + hi DiffDelete guibg=#875f5f + hi DiffText guibg=#87875f + if s:contrast == "low" + hi DiffText guifg=#d7d75f + else + hi DiffText guifg=#ffff87 + endif +endif + + +" ---------------------------------------------------------------------------- +" Spelling: +" ---------------------------------------------------------------------------- + +if s:style == "light" + hi SpellBad guisp=#d70000 + hi SpellCap guisp=#00afd7 + hi SpellLocal guisp=#d7af00 + hi SpellRare guisp=#5faf00 +else + hi SpellBad guisp=#d70000 + hi SpellCap guisp=#00afd7 + hi SpellLocal guisp=#d7af00 + hi SpellRare guisp=#5faf00 +endif + + +" ---------------------------------------------------------------------------- +" Miscellaneous: +" ---------------------------------------------------------------------------- + +hi Ignore guifg=bg +hi Underlined guifg=fg + + +" ============================================================================ +" Text Emphasis: +" ============================================================================ + +if s:use_bold == 1 + for s:item in s:bold_items + exec "hi " . s:item . " gui=bold cterm=bold term=none" + endfor +endif + +if s:use_underline == 1 + for s:item in s:underline_items + exec "hi " . s:item . " gui=underline cterm=underline term=none" + endfor + for s:item in s:undercurl_items + exec "hi " . s:item . " cterm=underline" + endfor +endif + +for s:item in s:undercurl_items + exec "hi " . s:item . " gui=undercurl term=none" +endfor + + +" ============================================================================ +" Cterm Colors: +" ============================================================================ + +for s:item in s:normal_items + s:bold_items + s:underline_items + call s:AddCterm(s:item) +endfor + +for s:item in s:undercurl_items + call s:AddSpCterm(s:item) +endfor + +if s:no_term_bg == 1 + hi Normal ctermbg=NONE +endif + + +" ============================================================================ +" Alternative Bold Definitions: +" ============================================================================ + +let s:alternative_bold_items = ["Identifier", "PreProc", "Statement", + \ "Special", "Constant", "Type"] + +for s:item in s:alternative_bold_items + exec "let s:temp_gui_fg = synIDattr(synIDtrans(hlID('" . s:item . + \ "')), 'fg', 'gui')" + exec "let s:temp_cterm_fg = synIDattr(synIDtrans(hlID('" . s:item . + \ "')), 'fg', 'cterm')" + exec "hi B" . s:item . " guifg=" . s:temp_gui_fg . " ctermfg=" . + \ s:temp_cterm_fg . " gui=bold cterm=bold term=none" +endfor + + +" ============================================================================ +" Plugin Specific Colors: +" ============================================================================ + +" Tagbar: +hi link TagbarAccessPublic Constant +hi link TagbarAccessProtected Type +hi link TagbarAccessPrivate PreProc + +" Vimwiki: +hi link VimwikiHeader1 BIdentifier +hi link VimwikiHeader2 BPreProc +hi link VimwikiHeader3 BStatement +hi link VimwikiHeader4 BSpecial +hi link VimwikiHeader5 BConstant +hi link VimwikiHeader6 BType + + +" ============================================================================ +" Preset Commands: +" ============================================================================ + +function! SetLucius(style, contrast, contrast_bg) + let g:lucius_style = a:style + let g:lucius_contrast = a:contrast + let g:lucius_contrast_bg = a:contrast_bg +endfunction + +command! LuciusLight call SetLucius("light", "normal", "normal") + \ | colorscheme lucius +command! LuciusLightLowContrast call SetLucius("light", "low", "normal") + \ | colorscheme lucius +command! LuciusLightHighContrast call SetLucius("light", "high", "normal") + \ | colorscheme lucius + +command! LuciusWhite call SetLucius("light", "normal", "high") + \ | colorscheme lucius +command! LuciusWhiteLowContrast call SetLucius("light", "low", "high") + \ | colorscheme lucius +command! LuciusWhiteHighContrast call SetLucius("light", "high", "high") + \ | colorscheme lucius + +command! LuciusDark call SetLucius("dark", "normal", "normal") + \ | colorscheme lucius +command! LuciusDarkLowContrast call SetLucius("dark", "low", "normal") + \ | colorscheme lucius +command! LuciusDarkHighContrast call SetLucius("dark", "high", "normal") + \ | colorscheme lucius + +command! LuciusBlack call SetLucius("dark", "normal", "high") + \ | colorscheme lucius +command! LuciusBlackLowContrast call SetLucius("dark", "low", "high") + \ | colorscheme lucius +command! LuciusBlackHighContrast call SetLucius("dark", "high", "high") + \ | colorscheme lucius + +" vim: tw=78 diff --git a/.vim/colors/pigraph.vim b/.vim/colors/pigraph.vim new file mode 100644 index 0000000..fc52551 --- /dev/null +++ b/.vim/colors/pigraph.vim @@ -0,0 +1,73 @@ +"pigraph theme based on blackdust +"fmeyer@pigraph.com + + +set background=dark +hi clear + +if exists("syntax_on") + syntax reset +endif + +hi Boolean guifg=#eee689 +hi Character guifg=#eee689 +hi Comment guifg=#7f7f7f +hi Condtional guifg=#8fffff +hi Constant guifg=#eee689 gui=none +hi Cursor guifg=#000000 guibg=#aeaeae +hi Debug guifg=#eee689 +hi Define guifg=#83b1d4 +hi Delimiter guifg=#8f8f8f +hi DiffAdd guibg=#613c46 +hi DiffChange guibg=#333333 +hi DiffDelete guifg=#333333 guibg=#464646 gui=none +hi DiffText guifg=#ffffff guibg=#1f1f1f +hi Directory guifg=#ffffff +hi Error guifg=#000000 guibg=#00ffff +hi ErrorMsg guifg=#000000 guibg=#00c0cf +hi Exception guifg=#8fffff gui=underline +hi Float guifg=#9c93b3 +hi FoldColumn guifg=#eee689 guibg=#464646 +hi Folded guifg=#eee689 guibg=#333333 +hi Function guifg=#d38e63 +hi Identifier guifg=#ffffff +hi Include guifg=#ee8a37 +hi IncSearch guifg=#000000 guibg=#b1d631 +hi Keyword guifg=#ffffff +hi Label guifg=#8fffff gui=underline +hi Macro guifg=#ee8a37 +hi MatchParen guifg=#d0ffc0 guibg=#202020 ctermfg=157 ctermbg=237 cterm=bold +hi ModeMsg guifg=#eee689 +hi MoreMsg guifg=#ffffff +hi NonText guifg=#1f1f1f +hi LineNr guifg=#7f7f7f guibg=#343a3f +hi Normal guifg=#d6dbdf guibg=#2c3237 gui=none +hi Number guifg=#aca0a3 +hi Operator guifg=#ffffff +hi Pmenu guifg=#ffffff guibg=#202020 ctermfg=255 ctermbg=238 +hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148 +hi PreCondit guifg=#dfaf8f +hi PreProc guifg=#ee8a37 +hi Question guifg=#ffffff +hi Repeat guifg=#8fffff gui=underline +hi Search guifg=#000000 guibg=#b1d631 +hi SpecialChar guifg=#eee689 +hi SpecialComment guifg=#eee689 +hi Special guifg=#7f7f7f +hi SpecialKey guifg=#7e7e7e +hi Statement guifg=#8fffff +hi StatusLine guifg=#b1d631 guibg=#000000 +hi StatusLineNC guifg=#333333 guibg=#cccccc +hi StorageClass guifg=#ffffff +hi String guifg=#dbf0b3 +hi Structure guifg=#ffffff gui=underline +hi Tag guifg=#eee689 +hi Title guifg=#ffffff guibg=#333333 +hi Todo guifg=#ffffff guibg=#000000 +hi Typedef guifg=#ffffff gui=underline +hi Type guifg=#ffffff +hi VertSplit guifg=#444444 guibg=#303030 gui=none ctermfg=238 ctermbg=238 +hi Visual guifg=#000000 guibg=#b1d631 +hi VisualNOS guifg=#343a3f guibg=#f18c96 gui=underline +hi WarningMsg guifg=#ffffff guibg=#333333 +hi WildMenu guifg=#000000 guibg=#eee689 diff --git a/.vim/colors/smyck.vim b/.vim/colors/smyck.vim new file mode 100644 index 0000000..2a23734 --- /dev/null +++ b/.vim/colors/smyck.vim @@ -0,0 +1,94 @@ +" ---------------------------------------------------------------------------- +" Vim color file +" Maintainer: John-Paul Bader +" Last Change: 2012 April +" License: Beer Ware +" ---------------------------------------------------------------------------- + +let g:colors_name = "smyck" + +highlight clear Normal +set background=dark +set linespace=2 + +" Syntaxeinstellungen zuruecksetzen, wenn Syntax Highlighting aktiviert ist +if exists("syntax_on") + syntax reset +endif + +hi Normal cterm=none ctermbg=none ctermfg=15 gui=none guibg=#242424 guifg=#F7F7F7 +hi LineNr cterm=none ctermbg=none ctermfg=8 gui=none guibg=#242424 guifg=#8F8F8F +hi StatusLine cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#5D5D5D guifg=#FBFBFB +hi StatusLineNC cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#5D5D5D guifg=#FBFBFB +hi Search cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7 +hi IncSearch cterm=none ctermbg=3 ctermfg=8 gui=none guibg=#F6DC69 guifg=#8F8F8F +hi ColumnMargin cterm=none ctermbg=0 gui=none guibg=#000000 +hi Error cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 +hi ErrorMsg cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 +hi Folded cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#8F8F8F guifg=#C4E858 +hi FoldColumn cterm=none ctermbg=8 ctermfg=2 gui=none guibg=#8F8F8F guifg=#C4E858 +hi NonText cterm=bold ctermbg=none ctermfg=8 gui=bold guifg=#8F8F8F +hi ModeMsg cterm=bold ctermbg=none ctermfg=10 gui=none +hi Pmenu cterm=none ctermbg=8 ctermfg=15 gui=none guibg=#8F8F8F guifg=#F7F7F7 +hi PmenuSel cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F +hi PmenuSbar cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F +hi SpellBad cterm=none ctermbg=1 ctermfg=15 gui=none guifg=#F7F7F7 +hi SpellCap cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 +hi SpellRare cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 +hi SpellLocal cterm=none ctermbg=4 ctermfg=15 gui=none guifg=#F7F7F7 +hi Visual cterm=none ctermbg=15 ctermfg=8 gui=none guibg=#F7F7F7 guifg=#8F8F8F +hi Directory cterm=none ctermbg=none ctermfg=4 gui=none guibg=#242424 guifg=#88CCE7 +hi SpecialKey cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F +hi DiffAdd cterm=bold ctermbg=2 ctermfg=15 +hi DiffChange cterm=bold ctermbg=4 ctermfg=15 +hi DiffDelete cterm=bold ctermbg=1 ctermfg=15 +hi DiffText cterm=bold ctermbg=3 ctermfg=8 +hi MatchParen cterm=none ctermbg=6 ctermfg=15 gui=none guibg=#2EB5C1 guifg=#F7F7F7 +hi CursorLine cterm=none ctermbg=238 ctermfg=none gui=none guibg=#424242 +hi Title cterm=none ctermbg=none ctermfg=4 gui=none guifg=#88CCE7 + +" ---------------------------------------------------------------------------- +" Syntax Highlighting +" ---------------------------------------------------------------------------- +hi Keyword cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 +hi Comment cterm=none ctermbg=none ctermfg=8 gui=none guifg=#8F8F8F +hi Delimiter cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7 +hi Identifier cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 +hi Structure cterm=none ctermbg=none ctermfg=12 gui=none guifg=#9DEEF2 +hi Ignore cterm=none ctermbg=none ctermfg=8 gui=none guifg=bg +hi Constant cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 +hi PreProc cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 +hi Type cterm=none ctermbg=none ctermfg=12 gui=none guifg=#96D9F1 +hi Statement cterm=none ctermbg=none ctermfg=10 gui=none guifg=#D1FA71 +hi Special cterm=none ctermbg=none ctermfg=6 gui=none guifg=#d7d7d7 +hi String cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69 +hi Number cterm=none ctermbg=none ctermfg=3 gui=none guifg=#F6DC69 +hi Underlined cterm=underline gui=underline +hi Symbol cterm=none ctermbg=none ctermfg=9 gui=none guifg=#FAB1AB +hi Method cterm=none ctermbg=none ctermfg=15 gui=none guifg=#F7F7F7 +hi Interpolation cterm=none ctermbg=none ctermfg=6 gui=none guifg=#2EB5C1 + +" Erlang +hi link erlangAtom Keyword +hi link erlangBitType Keyword + +hi link rubyBeginend Keyword +hi link rubyClass Keyword +hi link rubyModule Keyword +hi link rubyKeyword Keyword +hi link rubyOperator Method +hi link rubyIdentifier Keyword +hi link rubyClassVariable Symbol +hi link rubyInstanceVariable Constant +hi link rubyGlobalVariable Constant +hi link rubyClassVariable Method +hi link rubyConstant Constant +hi link rubySymbol Symbol +hi link rubyFunction Constant +hi link rubyControl Keyword +hi link rubyConditional Keyword +hi link rubyInterpolation Interpolation +hi link rubyInterpolationDelimiter Interpolation +hi link rubyRailsMethod Method + + diff --git a/.vim/colors/solarized.vim b/.vim/colors/solarized.vim new file mode 100644 index 0000000..81c2c99 --- /dev/null +++ b/.vim/colors/solarized.vim @@ -0,0 +1,964 @@ +" 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) +" +" 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: +" +" set background=dark +" colorscheme solarized +" +" or, for the light background mode of Solarized: +" +" 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: +" +" 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. +" +" If you do use the custom terminal colors, simply add the following line +" *before* the `colorschem solarized` line: +" +" let g:solarized_termcolors=16 +" +" --------------------------------------------------------------------- +" TOGGLE BACKGROUND FUNCTION +" --------------------------------------------------------------------- +" Here's a quick script that toggles the background color, using F5 in this +" example. You can drop this into .vimrc: +" +" function! ToggleBackground() +" if (g:solarized_style=="dark") +" let g:solarized_style="light" +" colorscheme solarized +" else +" let g:solarized_style="dark" +" colorscheme solarized +" endif +" endfunction +" command! Togbg call ToggleBackground() +" nnoremap :call ToggleBackground() +" inoremap :call ToggleBackground()a +" vnoremap :call ToggleBackground() +" +" --------------------------------------------------------------------- +" OPTIONS +" --------------------------------------------------------------------- +" +" Set these in your vimrc file prior to calling the colorscheme. +" +" option name default optional +" ------------------------------------------------ +" g:solarized_termcolors= 256 | 16 +" 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_style = "dark" | "light" +" g:solarized_contrast = "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; Terminal.app/iTerm2 did not. +" +" ------------------------------------------------ +" 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_style = "dark" | "light" +" ------------------------------------------------ +" Simply another way to force Solarized to use a dark or light background. +" It's better to use `set background=dark` or `set background=light` in your +" .vimrc file. This option is mostly used in scripts (quick background color +" change) or for testing. Note that, if set, g:solarized_style overrides the +" setting for "background". +" +" ------------------------------------------------ +" 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. +" +" --------------------------------------------------------------------- +" 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") + let g:solarized_termtrans = 0 +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 = 256 +endif +if !exists("g:solarized_style") && !exists("g:solarized_style") + let g:solarized_style = &background +endif +if !exists("g:solarized_contrast") + let g:solarized_contrast = "normal" +endif +"}}} +" Colorscheme basic settings"{{{ +" --------------------------------------------------------------------- +if g:solarized_style == "dark" + set background=dark +elseif g:solarized_style == "light" + set background=light +else + let g:solarized_style = &background +endif + +hi clear +if exists("syntax_on") + syntax reset +endif + +let colors_name = "solarized" +"let colors_name = &background +"if background == "light" +" let colors_name = &background +"else +" let colors_name = &background +"endif +"}}} +" 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:g_back = "#002b36" + let s:g_base03 = "#002b36" + let s:g_base02 = "#073642" + let s:g_base01 = "#586e75" + let s:g_base00 = "#657b83" + let s:g_base0 = "#839496" + let s:g_base1 = "#93a1a1" + let s:g_base2 = "#eee8d5" + let s:g_base3 = "#fdf6e3" + let s:g_yellow = "#b58900" + let s:g_orange = "#cb4b16" + let s:g_red = "#dc322f" + let s:g_magenta = "#d33682" + let s:g_violet = "#6c71c4" + let s:g_blue = "#268bd2" + let s:g_cyan = "#2aa198" + let s:g_green = "#859900" +else + " these colors are for non-gui vim when CSApprox is installed. CSApprox + " degrades the base colors poorly (bright blues instead of muted gray + " blues) so we set all hex values here to ones which CSApprox will not + " change and which we approve of. Perhaps I should just can the hex values + " and use just the color table values, leaving these blank. Not much + " difference either way and I'd rather be thorough about it. + " They can also be used by setting g:solarized_degrade to 1 in vimrc + let s:g_back = "#1c1c1c" + let s:g_base03 = "#1c1c1c" + let s:g_base02 = "#262626" + let s:g_base01 = "#4e4e4e" + let s:g_base00 = "#585858" + let s:g_base0 = "#808080" + let s:g_base1 = "#8a8a8a" + let s:g_base2 = "#d7d7af" + let s:g_base3 = "#ffffd7" + let s:g_yellow = "#af8700" + let s:g_orange = "#d75f00" + let s:g_red = "#af0000" + let s:g_magenta = "#af005f" + let s:g_violet = "#5f5faf" + let s:g_blue = "#0087ff" + let s:g_cyan = "#00afaf" + let s:g_green = "#5f8700" +endif +"}}} +" 256 Terminal (no CSApprox) and 16 color fallback palettes"{{{ +" --------------------------------------------------------------------- +" We also set this if gui is running as we use the optional formatting +" values that get set here (ou==optional underline, ob==opt bold). +if (has("gui_running") || &t_Co == 256) && g:solarized_termcolors != 16 + let s:c_back = "234" + let s:c_base03 = "234" + let s:c_base02 = "235" + let s:c_base01 = "239" + let s:c_base00 = "240" + let s:c_base0 = "244" + let s:c_base1 = "245" + let s:c_base2 = "187" + let s:c_base3 = "230" + let s:c_yellow = "136" + let s:c_orange = "166" + let s:c_red = "124" + let s:c_magenta = "125" + let s:c_violet = "61" + let s:c_blue = "33" + let s:c_cyan = "37" + let s:c_green = "64" + let s:ou = "" + let s:ob = "" +elseif &t_Co > 8 || g:solarized_termcolors == 16 + " NOTE: this requires terminal colors to be set to solarized standard + " 16 colors (see top of this file for details) + let s:c_back = "NONE" + let s:c_base03 = "8" + let s:c_base02 = "0" + let s:c_base01 = "10" + let s:c_base00 = "11" + let s:c_base0 = "12" + let s:c_base1 = "14" + let s:c_base2 = "7" + let s:c_base3 = "15" + let s:c_green = "2" + let s:c_yellow = "3" + let s:c_orange = "9" + let s:c_red = "1" + let s:c_magenta = "5" + let s:c_violet = "13" + let s:c_blue = "4" + let s:c_cyan = "6" + let s:ou = "" + let s:ob = "" +else " must be in an 8 color or less terminal + let s:c_back = "NONE" + let s:c_base03 = "4" + let s:c_base02 = "darkgrey" + let s:c_base01 = "grey" + let s:c_base00 = "darkgrey" + let s:c_base0 = "6" + let s:c_base1 = "4" + let s:c_base2 = "7" + let s:c_base3 = "7" + let s:c_green = "2" + let s:c_yellow = "3" + let s:c_orange = "3" + let s:c_red = "1" + let s:c_magenta = "5" + let s:c_violet = "5" + let s:c_blue = "4" + let s:c_cyan = "6" + let s:ou = ",underline" + let s:ob = ",bold" +endif +"}}} +" Formatting options and null values for passthrough effect"{{{ +" --------------------------------------------------------------------- +let s:g_none = "NONE" +let s:c_none = "NONE" +let s:t_none = "NONE" +let s:n = "NONE" +let s:c = ",undercurl" +let s:r = ",reverse" +let s:s = ",standout" +"}}} +" Alternate light scheme "{{{ +" --------------------------------------------------------------------- +if g:solarized_style == "light" + let s:c_temp03 = s:c_base03 + let s:c_temp02 = s:c_base02 + let s:c_temp01 = s:c_base01 + let s:c_temp00 = s:c_base00 + let s:c_base03 = s:c_base3 + let s:c_base02 = s:c_base2 + let s:c_base01 = s:c_base1 + let s:c_base00 = s:c_base0 + let s:c_base0 = s:c_temp00 + let s:c_base1 = s:c_temp01 + let s:c_base2 = s:c_temp02 + let s:c_base3 = s:c_temp03 + let s:c_back = s:c_base03 + let s:g_temp03 = s:g_base03 + let s:g_temp02 = s:g_base02 + let s:g_temp01 = s:g_base01 + let s:g_temp00 = s:g_base00 + let s:g_base03 = s:g_base3 + let s:g_base02 = s:g_base2 + let s:g_base01 = s:g_base1 + let s:g_base00 = s:g_base0 + let s:g_base0 = s:g_temp00 + let s:g_base1 = s:g_temp01 + let s:g_base2 = s:g_temp02 + let s:g_base3 = s:g_temp03 + let s:g_back = s:g_base03 +endif +"}}} +" Alternate inverted background scheme "{{{ +" --------------------------------------------------------------------- +if g:solarized_style == "inverted" + let s:c_temp03 = s:c_base03 + let s:c_temp02 = s:c_base02 + let s:c_base03 = s:c_temp02 + let s:c_base02 = s:c_temp03 + let s:c_back = s:c_base03 + let s:g_temp03 = s:g_base03 + let s:g_temp02 = s:g_base02 + let s:g_base03 = s:g_temp02 + let s:g_base02 = s:g_temp03 + let s:g_back = s:g_base03 +endif +"}}} +" Optional contrast schemes "{{{ +" --------------------------------------------------------------------- +if g:solarized_contrast == "high" + let s:g_base03 = s:g_base03 + let s:g_base02 = s:g_base02 + let s:g_base01 = s:g_base00 + let s:g_base00 = s:g_base0 + let s:g_base0 = s:g_base1 + let s:g_base1 = s:g_base2 + let s:g_base2 = s:g_base3 + let s:g_base3 = s:g_base3 + let s:g_back = s:g_back +endif +if g:solarized_contrast == "low" + let s:g_back = s:g_base02 + let s:ou = ",underline" +endif +"}}} +" Overrides dependent on user specified values"{{{ +" --------------------------------------------------------------------- +if g:solarized_termtrans == 1 + let s:c_back = "NONE" +endif + +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 = ' ctermbg=".s:c_none ." guibg=".s:g_none ."'" +exe "let s:bg_back = ' ctermbg=".s:c_back ." guibg=".s:g_back ."'" +exe "let s:bg_base03 = ' ctermbg=".s:c_base03 ." guibg=".s:g_base03 ."'" +exe "let s:bg_base02 = ' ctermbg=".s:c_base02 ." guibg=".s:g_base02 ."'" +exe "let s:bg_base01 = ' ctermbg=".s:c_base01 ." guibg=".s:g_base01 ."'" +exe "let s:bg_base00 = ' ctermbg=".s:c_base00 ." guibg=".s:g_base00 ."'" +exe "let s:bg_base0 = ' ctermbg=".s:c_base0 ." guibg=".s:g_base0 ."'" +exe "let s:bg_base1 = ' ctermbg=".s:c_base1 ." guibg=".s:g_base1 ."'" +exe "let s:bg_base2 = ' ctermbg=".s:c_base2 ." guibg=".s:g_base2 ."'" +exe "let s:bg_base3 = ' ctermbg=".s:c_base3 ." guibg=".s:g_base3 ."'" +exe "let s:bg_green = ' ctermbg=".s:c_green ." guibg=".s:g_green ."'" +exe "let s:bg_yellow = ' ctermbg=".s:c_yellow ." guibg=".s:g_yellow ."'" +exe "let s:bg_orange = ' ctermbg=".s:c_orange ." guibg=".s:g_orange ."'" +exe "let s:bg_red = ' ctermbg=".s:c_red ." guibg=".s:g_red ."'" +exe "let s:bg_magenta = ' ctermbg=".s:c_magenta." guibg=".s:g_magenta."'" +exe "let s:bg_violet = ' ctermbg=".s:c_violet ." guibg=".s:g_violet ."'" +exe "let s:bg_blue = ' ctermbg=".s:c_blue ." guibg=".s:g_blue ."'" +exe "let s:bg_cyan = ' ctermbg=".s:c_cyan ." guibg=".s:g_cyan ."'" + +exe "let s:fg_none = ' ctermfg=".s:c_none ." guifg=".s:g_none ."'" +exe "let s:fg_back = ' ctermfg=".s:c_back ." guifg=".s:g_back ."'" +exe "let s:fg_base03 = ' ctermfg=".s:c_base03 ." guifg=".s:g_base03 ."'" +exe "let s:fg_base02 = ' ctermfg=".s:c_base02 ." guifg=".s:g_base02 ."'" +exe "let s:fg_base01 = ' ctermfg=".s:c_base01 ." guifg=".s:g_base01 ."'" +exe "let s:fg_base00 = ' ctermfg=".s:c_base00 ." guifg=".s:g_base00 ."'" +exe "let s:fg_base0 = ' ctermfg=".s:c_base0 ." guifg=".s:g_base0 ."'" +exe "let s:fg_base1 = ' ctermfg=".s:c_base1 ." guifg=".s:g_base1 ."'" +exe "let s:fg_base2 = ' ctermfg=".s:c_base2 ." guifg=".s:g_base2 ."'" +exe "let s:fg_base3 = ' ctermfg=".s:c_base3 ." guifg=".s:g_base3 ."'" +exe "let s:fg_green = ' ctermfg=".s:c_green ." guifg=".s:g_green ."'" +exe "let s:fg_yellow = ' ctermfg=".s:c_yellow ." guifg=".s:g_yellow ."'" +exe "let s:fg_orange = ' ctermfg=".s:c_orange ." guifg=".s:g_orange ."'" +exe "let s:fg_red = ' ctermfg=".s:c_red ." guifg=".s:g_red ."'" +exe "let s:fg_magenta = ' ctermfg=".s:c_magenta." guifg=".s:g_magenta."'" +exe "let s:fg_violet = ' ctermfg=".s:c_violet ." guifg=".s:g_violet ."'" +exe "let s:fg_blue = ' ctermfg=".s:c_blue ." guifg=".s:g_blue ."'" +exe "let s:fg_cyan = ' ctermfg=".s:c_cyan ." guifg=".s:g_cyan ."'" + +exe "let s:sp_none = ' guisp=".s:g_none ."'" +exe "let s:sp_back = ' guisp=".s:g_back ."'" +exe "let s:sp_base03 = ' guisp=".s:g_base03 ."'" +exe "let s:sp_base02 = ' guisp=".s:g_base02 ."'" +exe "let s:sp_base01 = ' guisp=".s:g_base01 ."'" +exe "let s:sp_base00 = ' guisp=".s:g_base00 ."'" +exe "let s:sp_base0 = ' guisp=".s:g_base0 ."'" +exe "let s:sp_base1 = ' guisp=".s:g_base1 ."'" +exe "let s:sp_base2 = ' guisp=".s:g_base2 ."'" +exe "let s:sp_base3 = ' guisp=".s:g_base3 ."'" +exe "let s:sp_green = ' guisp=".s:g_green ."'" +exe "let s:sp_yellow = ' guisp=".s:g_yellow ."'" +exe "let s:sp_orange = ' guisp=".s:g_orange ."'" +exe "let s:sp_red = ' guisp=".s:g_red ."'" +exe "let s:sp_magenta = ' guisp=".s:g_magenta."'" +exe "let s:sp_violet = ' guisp=".s:g_violet ."'" +exe "let s:sp_blue = ' guisp=".s:g_blue ."'" +exe "let s:sp_cyan = ' guisp=".s:g_cyan ."'" + +exe "let s:fmt_none = ' cterm=NONE". " gui=NONE". " term=NONE". "'" +exe "let s:fmt_bold = ' cterm=NONE".s:b." gui=NONE".s:b." term=NONE".s:b."'" +exe "let s:fmt_bldi = ' cterm=NONE".s:b." gui=NONE".s:b.s:i." term=NONE".s:b."'" +exe "let s:fmt_undr = ' cterm=NONE".s:u." gui=NONE".s:u." term=NONE".s:u."'" +exe "let s:fmt_undb = ' cterm=NONE".s:u.s:b." gui=NONE".s:u.s:b. + \" term=NONE".s:u.s:b."'" +exe "let s:fmt_undi = ' cterm=NONE".s:u." gui=NONE".s:u.s:i. + \" term=NONE".s:u."'" +exe "let s:fmt_uopt = ' cterm=NONE".s:ou." gui=NONE".s:ou. + \" term=NONE".s:ou."'" +exe "let s:fmt_bopt = ' cterm=NONE".s:ob." gui=NONE".s:ob. + \" term=NONE".s:ob."'" +exe "let s:fmt_curl = ' cterm=NONE".s:c." gui=NONE".s:c." term=NONE".s:c."'" +exe "let s:fmt_ital = ' cterm=NONE". " gui=NONE".s:i." term=NONE". "'" +exe "let s:fmt_revr = ' cterm=NONE".s:r." gui=NONE".s:r." term=NONE".s:r."'" +exe "let s:fmt_stnd = ' cterm=NONE".s:s." gui=NONE".s:s." term=NONE".s:s."'" +"}}} +" Basic highlighting"{{{ +" --------------------------------------------------------------------- +" note that link syntax to avoid duplicate configuration doesn't work with the +" exe compiled formats + +exe "hi Normal" . s:fg_base0 .s:bg_back .s:fmt_none + +exe "hi Comment" . s:fg_base01 .s:bg_none .s:fmt_ital +" *Comment any comment + +exe "hi Constant" . s:fg_cyan .s:bg_none .s:fmt_none +"exe "hi String" . s:fg_yellow .s:bg_none .s:fmt_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:fg_blue .s:bg_none .s:fmt_none +" *Identifier any variable name +" Function function name (also: methods for classes) +" +exe "hi Statement" . s:fg_green .s:bg_none .s:fmt_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:fg_orange .s:bg_none .s:fmt_none +" *PreProc generic Preprocessor +" Include preprocessor #include +" Define preprocessor #define +" Macro same as Define +" PreCondit preprocessor #if, #else, #endif, etc. + +exe "hi Type" . s:fg_yellow .s:bg_none .s:fmt_none +" *Type int, long, char, etc. +" StorageClass static, register, volatile, etc. +" Structure struct, union, enum, etc. +" Typedef A typedef + +exe "hi Special" . s:fg_red .s:bg_none .s:fmt_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:fg_violet .s:bg_none .s:fmt_none +" *Underlined text that stands out, HTML links + +exe "hi Ignore" . s:fg_none .s:bg_none .s:fmt_none +" *Ignore left blank, hidden |hl-Ignore| + +exe "hi Error" . s:fg_red .s:bg_none .s:fmt_bold +" *Error any erroneous construct + +exe "hi Todo" . s:fg_magenta.s:bg_none .s:fmt_bold +" *Todo anything that needs extra attention; mostly the +" keywords TODO FIXME and XXX +" +"Highlighting groups for various occasions +"----------------------------------------- +exe "hi SpecialKey" . s:fg_base02 .s:bg_none .s:fmt_none +exe "hi NonText" . s:fg_base02 .s:bg_none .s:fmt_bold +exe "hi Directory" . s:fg_blue .s:bg_none .s:fmt_none +exe "hi ErrorMsg" . s:fg_red .s:bg_none .s:fmt_revr +exe "hi IncSearch" . s:fg_yellow .s:bg_none .s:fmt_revr +exe "hi Search" . s:fg_yellow .s:bg_none .s:fmt_stnd +exe "hi MoreMsg" . s:fg_blue .s:bg_none .s:fmt_none +exe "hi ModeMsg" . s:fg_blue .s:bg_none .s:fmt_none +exe "hi LineNr" . s:fg_base01 .s:bg_base02 .s:fmt_none +exe "hi Question" . s:fg_cyan .s:bg_none .s:fmt_bold +exe "hi StatusLine" . s:fg_base0 .s:bg_base02 .s:fmt_none +exe "hi StatusLineNC" . s:fg_base1 .s:bg_base02 .s:fmt_none +exe "hi VertSplit" . s:fg_base0 .s:bg_base02 .s:fmt_none +exe "hi Title" . s:fg_orange .s:bg_none .s:fmt_bold +exe "hi Visual" . s:fg_none .s:bg_base02 .s:fmt_stnd +exe "hi VisualNOS" . s:fg_none .s:bg_base02 .s:fmt_stnd +exe "hi WarningMsg" . s:fg_red .s:bg_none .s:fmt_bold +exe "hi WildMenu" . s:fg_base1 .s:bg_base02 .s:fmt_none +exe "hi Folded" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base03 +exe "hi FoldColumn" . s:fg_base0 .s:bg_base02 .s:fmt_bold +exe "hi DiffAdd" . s:fg_green .s:bg_none .s:fmt_revr +exe "hi DiffChange" . s:fg_yellow .s:bg_none .s:fmt_revr +exe "hi DiffDelete" . s:fg_red .s:bg_none .s:fmt_revr +exe "hi DiffText" . s:fg_blue .s:bg_none .s:fmt_revr +exe "hi SignColumn" . s:fg_base0 .s:bg_base02 .s:fmt_none +exe "hi Conceal" . s:fg_blue .s:bg_none .s:fmt_none +exe "hi SpellBad" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_red +exe "hi SpellCap" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_violet +exe "hi SpellRare" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_cyan +exe "hi SpellLocal" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_yellow +exe "hi Pmenu" . s:fg_base0 .s:bg_base02 .s:fmt_none +exe "hi PmenuSel" . s:fg_base2 .s:bg_base01 .s:fmt_none +exe "hi PmenuSbar" . s:fg_base0 .s:bg_base2 .s:fmt_none +exe "hi PmenuThumb" . s:fg_base03 .s:bg_base0 .s:fmt_none +exe "hi TabLine" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base0 +exe "hi TabLineSel" . s:fg_base2 .s:bg_base01 .s:fmt_undr .s:sp_base0 +exe "hi TabLineFill" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base0 +exe "hi CursorColumn" . s:fg_none .s:bg_base02 .s:fmt_none +exe "hi CursorLine" . s:fg_none .s:bg_base02 .s:fmt_uopt .s:sp_base1 +exe "hi ColorColumn" . s:fg_none .s:bg_base02 .s:fmt_none +exe "hi Cursor" . s:fg_none .s:bg_none .s:fmt_revr +exe "hi lCursor" . s:fg_none .s:bg_none .s:fmt_stnd +exe "hi MatchParen" . s:fg_red .s:bg_base01 .s:fmt_bold + +"}}} +" Extended highlighting "{{{ +" --------------------------------------------------------------------- +"}}} +" 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 helpSpecial" . s:fg_yellow .s:bg_none .s:fmt_none +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 + +"}}} +" 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. +" +"}}} diff --git a/.vim/colors/terse.vim b/.vim/colors/terse.vim new file mode 100644 index 0000000..53b1567 --- /dev/null +++ b/.vim/colors/terse.vim @@ -0,0 +1,126 @@ +" Terse Verses Of Utter Control +" A Vim Color Theme +" Author: Jevgeni Tarasov +" Version: 1 +" +" A terse color theme. No candy colors, no wild contrasts, no green on black. +" N.B! The cterm version is woefully underdeveloped in this version. Don't use +" it. + +"-- Init ---------------------------------------------------------------------- +hi clear +set background=light +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="terse" + + +"-- Text Elements ------------------------------------------------------------- +hi Normal gui=NONE guifg=#00011f guibg=#ecebe7 +\ cterm=NONE ctermfg=black ctermbg=white + +hi Statement gui=bold guifg=#00011f guibg=NONE +\ cterm=bold ctermfg=black ctermbg=white + +hi Comment gui=italic guifg=#38362b guibg=NONE +\ cterm=italic ctermfg=black ctermbg=white + +hi Type gui=NONE guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi Special gui=bold guifg=NONE guibg=NONE +\ cterm=bold ctermfg=black ctermbg=white + +hi Identifier gui=underline guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi PreProc gui=bold,italic guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi Constant gui=italic guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi String gui=italic guifg=NONE guibg=#e2e1dd +\ cterm=NONE ctermfg=black ctermbg=white + +hi StatusLine gui=italic guifg=#ecebe7 guibg=#00011f +\ cterm=NONE ctermfg=white ctermbg=grey +hi StatusLineNC gui=italic guifg=#ecebe7 guibg=#00011f +\ cterm=NONE ctermfg=white ctermbg=grey + + +hi Error gui=NONE guifg=white guibg=#c80f3f +\ cterm=NONE ctermfg=black ctermbg=white + +hi Todo gui=bold,italic guifg=#e4115b guibg=#e2e1dd +\ cterm=NONE ctermfg=black ctermbg=white + +hi Underlined gui=underline guifg=NONE guibg=NONE +\ cterm=underline ctermfg=black ctermbg=white + + +"-- Non-Text Elements --------------------------------------------------------- +hi NonText gui=NONE guifg=#58595b guibg=#e2e1dd +\ cterm=NONE ctermfg=grey ctermbg=black + +hi Search gui=NONE guifg=NONE guibg=#fbf285 +\ cterm=NONE ctermfg=black ctermbg=yellow +hi IncSearch gui=NONE guifg=NONE guibg=#fbf285 +\ cterm=NONE ctermfg=black ctermbg=yellow + +hi Directory gui=bold guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi MoreMsg gui=italic guifg=NONE guibg=#e2e1dd +\ cterm=NONE ctermfg=black ctermbg=white + +hi LineNr gui=italic guifg=#58595b guibg=#e2e1dd +\ cterm=NONE ctermfg=grey ctermbg=black + +hi VertSplit gui=italic guifg=#00011f guibg=#00011f +\ cterm=NONE ctermfg=grey ctermbg=grey + +hi Question gui=NONE guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi Title gui=bold,italic guifg=NONE guibg=NONE +\ cterm=NONE ctermfg=black ctermbg=white + +hi WarningMsg gui=NONE guifg=white guibg=#c80f3f +\ cterm=NONE ctermfg=black ctermbg=white + +hi Folded gui=NONE guifg=NONE guibg=#e2e1dd +\ cterm=NONE ctermfg=black ctermbg=white +hi FoldColumn gui=NONE guifg=NONE guibg=#e2e1dd +\ cterm=NONE ctermfg=black ctermbg=white + +hi DiffAdd gui=NONE guifg=NONE guibg=#acd58e +\ cterm=NONE ctermfg=black ctermbg=white +hi DiffChange gui=NONE guifg=#00254f guibg=#93d2f3 +\ cterm=NONE ctermfg=black ctermbg=white +hi DiffDelete gui=NONE guifg=#820056 guibg=#edb2d1 +\ cterm=NONE ctermfg=black ctermbg=white +hi DiffText gui=NONE guifg=#00254f guibg=#93d2f3 +\ cterm=NONE ctermfg=black ctermbg=white + +hi Cursor gui=NONE guifg=white guibg=black +\ cterm=NONE ctermfg=white ctermbg=black + +hi Visual gui=NONE guifg=NONE guibg=#efbf28 +\ cterm=NONE ctermfg=black ctermbg=white + +hi MatchParen gui=bold guifg=#c80f3f guibg=NONE +\ cterm=NONE ctermfg=white ctermbg=black + + +" MacVim was changing the color of Visual everytime focus was lost +" The following code snippet was stolen from macvim.vim, to counter that effect. +if has("gui_macvim") && !exists("s:augroups_defined") + au FocusLost * if exists("colors_name") && colors_name == "terse" | hi Visual guibg=#efbf285 | endif + au FocusGained * if exists("colors_name") && colors_name == "terse" | hi Visual guibg=#efbf285 | endif + let s:augroups_defined = 1 +endif diff --git a/.vim/colors/twilight.vim b/.vim/colors/twilight.vim new file mode 100644 index 0000000..239023e --- /dev/null +++ b/.vim/colors/twilight.vim @@ -0,0 +1,511 @@ +" Twilight based on famouse Jellybeans theme +" Modified by M.L. + +" Vim color file +" +" " __ _ _ _ " +" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ " +" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| " +" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ " +" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ " +" " \___/ " +" +" "A colorful, dark color scheme for Vim." +" +" File: jellybeans.vim +" Maintainer: NanoTech +" Version: 1.5~git +" Last Change: April 11th, 2011 +" Contributors: Daniel Herbert , +" Henry So, Jr. , +" David Liang +" +" Copyright (c) 2009-2011 NanoTech +" +" 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. + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "jellybeans" + +if has("gui_running") || &t_Co == 88 || &t_Co == 256 + let s:low_color = 0 +else + let s:low_color = 1 +endif + +" Color approximation functions by Henry So, Jr. and David Liang {{{ +" Added to jellybeans.vim by Daniel Herbert + +" returns an approximate grey index for the given grey level +fun! s: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! s: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! s: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! s: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! s: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! s: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! s:color(r, g, b) + " get the closest grey + let l:gx = s:grey_number(a:r) + let l:gy = s:grey_number(a:g) + let l:gz = s:grey_number(a:b) + + " get the closest color + let l:x = s:rgb_number(a:r) + let l:y = s:rgb_number(a:g) + let l:z = s:rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " there are two possibilities + let l:dgr = s:grey_level(l:gx) - a:r + let l:dgg = s:grey_level(l:gy) - a:g + let l:dgb = s:grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = s:rgb_level(l:gx) - a:r + let l:dg = s:rgb_level(l:gy) - a:g + let l:db = s: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 s:grey_color(l:gx) + else + " use the color + return s:rgb_color(l:x, l:y, l:z) + endif + else + " only one possibility + return s:rgb_color(l:x, l:y, l:z) + endif +endfun + +" returns the palette index to approximate the 'rrggbb' hex string +fun! s: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 s:color(l:r, l:g, l:b) +endfun + +" sets the highlighting for the given group +fun! s:X(group, fg, bg, attr, lcfg, lcbg) + if s:low_color + let l:fge = empty(a:lcfg) + let l:bge = empty(a:lcbg) + + if !l:fge && !l:bge + exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg + elseif !l:fge && l:bge + exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE" + elseif l:fge && !l:bge + exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg + endif + else + let l:fge = empty(a:fg) + let l:bge = empty(a:bg) + + if !l:fge && !l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg) + elseif !l:fge && l:bge + exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)." ctermbg=NONE" + elseif l:fge && !l:bge + exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermfg=NONE ctermbg=".s:rgb(a:bg) + endif + endif + + if a:attr == "" + exec "hi ".a:group." gui=none cterm=none" + else + let noitalic = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",") + if empty(noitalic) + let noitalic = "none" + endif + exec "hi ".a:group." gui=".a:attr." cterm=".noitalic + endif +endfun +" }}} + +call s:X("Normal","e8e8d3","151515","","White","") +set background=dark + +if version >= 700 + call s:X("CursorLine","","1c1c1c","","","Black") + call s:X("CursorColumn","","1c1c1c","","","Black") + call s:X("MatchParen","ffffff","80a090","bold","","DarkCyan") + + call s:X("TabLine","000000","b0b8c0","italic","","Black") + call s:X("TabLineFill","9098a0","","","","Black") + call s:X("TabLineSel","000000","f0f0f0","italic,bold","Black","White") + + " Auto-completion + call s:X("Pmenu","ffffff","606060","","White","Black") + call s:X("PmenuSel","101010","eeeeee","","Black","White") +endif + +call s:X("Visual","","404040","","","Black") +call s:X("Cursor","","b0d0f0","","","") + +"call s:X("LineNr","605958","151515","none","Black","") +call s:X("LineNr","4e4e4e","262626","none","DarkGrey","") +"call s:X("LineNr","666666","454545","none","Black","") +call s:X("Comment","888888","","italic","Grey","") +call s:X("Todo","808080","","bold","White","Black") + +call s:X("StatusLine","000000","dddddd","italic","Black","White") +call s:X("StatusLineNC","ffffff","403c41","italic","White","Black") +call s:X("VertSplit","777777","403c41","italic","Black","Black") +call s:X("WildMenu","f0a0c0","302028","","Magenta","") + +call s:X("Folded","a0a8b0","384048","italic","Black","") +call s:X("FoldColumn","535D66","1f1f1f","","","Black") +call s:X("SignColumn","777777","333333","","","Black") +call s:X("ColorColumn","","000000","","","Black") + +call s:X("Title","70b950","","bold","Green","") + +call s:X("Constant","cf6a4c","","","Red","") +call s:X("Special","799d6a","","","Green","") +call s:X("Delimiter","668799","","","Grey","") + +call s:X("String","99ad6a","","","Green","") +call s:X("StringDelimiter","556633","","","DarkGreen","") + + +call s:X("Identifier","c6b6ee","","","LightCyan","") + +call s:X("Structure","8fbfdc","","","LightCyan","") +call s:X("Function","ffb964","","","Yellow","") +"call s:X("Function","fad07a","","","Yellow","") +"call s:X("Statement","8197bf","","","DarkBlue","") +call s:X("Statement","6577bf","","","DarkBlue","") +call s:X("PreProc","8fbfdc","","","LightBlue","") + + + +call s:X("Type","ffb964","","","Yellow","") +call s:X("NonText","606060","151515","","Black","") + +call s:X("SpecialKey","444444","1c1c1c","","Black","") + +call s:X("Search","f0a0c0","302028","underline","Magenta","") + +call s:X("Directory","dad085","","","Yellow","") +call s:X("ErrorMsg","","902020","","","DarkRed") +hi! link Error ErrorMsg +hi! link MoreMsg Special +call s:X("Question","65C254","","","Green","") + + +" Spell Checking + +call s:X("SpellBad","","902020","underline","","DarkRed") +call s:X("SpellCap","","0000df","underline","","Blue") +call s:X("SpellRare","","540063","underline","","DarkMagenta") +call s:X("SpellLocal","","2D7067","underline","","Green") + +" Diff + +hi! link diffRemoved Constant +hi! link diffAdded String + +" VimDiff + +call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen") +call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed") +call s:X("DiffChange","","2B5B77","","White","DarkBlue") +call s:X("DiffText","8fbfdc","000000","reverse","Yellow","") + +" Python +hi! link pythonPreCondit Import +hi! link pythonBuiltinObj BuiltinObj +hi! link pythonBuiltinFunc BuiltinFunc +hi! link pythonDecorator Decorator +hi! link pythonDottedName DottedName +hi! link pythonAssignment Assignment +hi! link pythonCalOperator CalOperator +hi! link pythonSuperclass Superclass +"hi! link pythonSuperclasses Superclass +call s:X("Import","cda869","","","Brown","") +call s:X("BuiltinFunc","dad085","","","LightMagenta","") +call s:X("Definition","f8ed97","","","LightYellow","") +call s:X("Statement","87afd7","","","DarkBlue","") +call s:X("Number","ca6f4c","","","Red","") +"call s:X("Function","ffb964","","","Yellow","") +call s:X("Operator","afd7ff","","","Cyan","") +call s:X("CalOperator","af5f00","","","Yellow","") +call s:X("Decorator","57d700","","","Grean","") +call s:X("DottedName","57d700","","","Grean","") +call s:X("Comment","5f5f5f","","","DarkGrey","") +call s:X("Assignment","ffaf5f","","","LightOrange","") +call s:X("ParamName","5f87d7","","","LightBule","") +call s:X("Entity","ffb964","","","Yellow","") +call s:X("Superclass","9b5c2e","","","LightMagenta","") +call s:X("BuiltinObj","9b859d","","","LightCyan","") + +" PHP + +hi! link phpFunctions Function +call s:X("StorageClass","c59f6f","","","Red","") +hi! link phpSuperglobal Identifier +hi! link phpQuoteSingle StringDelimiter +hi! link phpQuoteDouble StringDelimiter +hi! link phpBoolean Constant +hi! link phpNull Constant +hi! link phpArrayPair Operator + +" Ruby + +hi! link rubySharpBang Comment +call s:X("rubyClass","447799","","","DarkBlue","") +call s:X("rubyIdentifier","c6b6fe","","","Cyan","") +hi! link rubyConstant Type +hi! link rubyFunction Function + +call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","") +call s:X("rubySymbol","7697d6","","","Blue","") +hi! link rubyGlobalVariable rubyInstanceVariable +hi! link rubyModule rubyClass +call s:X("rubyControl","7597c6","","","Blue","") + +hi! link rubyString String +hi! link rubyStringDelimiter StringDelimiter +hi! link rubyInterpolationDelimiter Identifier + +call s:X("rubyRegexpDelimiter","540063","","","Magenta","") +call s:X("rubyRegexp","dd0093","","","DarkMagenta","") +call s:X("rubyRegexpSpecial","a40073","","","Magenta","") + +call s:X("rubyPredefinedIdentifier","de5577","","","Red","") + +" JavaScript + +hi! link javaScriptValue Constant +hi! link javaScriptRegexpString rubyRegexp + +" CoffeeScript + +hi! link coffeeRegExp javaScriptRegexpString + +" Lua + +hi! link luaOperator Conditional + +" C + +hi! link cOperator Constant + +" Objective-C/Cocoa + +hi! link objcClass Type +hi! link cocoaClass objcClass +hi! link objcSubclass objcClass +hi! link objcSuperclass objcClass +hi! link objcDirective rubyClass +hi! link cocoaFunction Function +hi! link objcMethodName Identifier +hi! link objcMethodArg Normal +hi! link objcMessageName Identifier + +" Debugger.vim + +call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue") +call s:X("DbgBreakPt","","4F0037","","","DarkMagenta") + +" Plugins, etc. + +hi! link TagListFileName Directory +call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green") + +" Manual overrides for 256-color terminals. Dark colors auto-map badly. +if !s:low_color + hi StatusLineNC ctermbg=235 + hi Folded ctermbg=236 + hi FoldColumn ctermbg=234 + hi SignColumn ctermbg=236 + hi CursorColumn ctermbg=234 + hi CursorLine ctermbg=234 + hi SpecialKey ctermbg=234 + hi NonText ctermbg=233 + hi LineNr ctermbg=233 + hi DiffText ctermfg=81 + hi Normal ctermbg=233 + hi DbgBreakPt ctermbg=53 +endif + +" delete functions {{{ +delf s:X +delf s:rgb +delf s:color +delf s:rgb_color +delf s:rgb_level +delf s:rgb_number +delf s:grey_color +delf s:grey_level +delf s:grey_number +" }}} + diff --git a/.vim/colors/underwater-mod.vim b/.vim/colors/underwater-mod.vim index b0c58ca..cfccd57 100644 --- a/.vim/colors/underwater-mod.vim +++ b/.vim/colors/underwater-mod.vim @@ -1,98 +1,150 @@ " Maintainer: Mario Gutierrez (mario@mgutz.com) " Original Theme: Dmitry Kichenko (dmitrykichenko@gmail.com) -" Last Change: Jun 23, 2010 +" Last Change: Dec 28, 2010 +" Version: 0.3 -set background=dark +let colors_name = "underwater-mod" +set background=dark hi clear if exists("syntax_on") - syntax reset + syntax reset endif -let colors_name = "underwater-mod" -" Vim >= 7.0 specific colors if version >= 700 - " highlights current line - hi CursorLine guibg=#18374F - " cursor's colour - hi CursorColumn guibg=#ffffff - "hi MatchParen guifg=#ffffff guibg=#439ea9 gui=bold - hi MatchParen guifg=magenta guibg=bg gui=bold - hi Pmenu guifg=#dfeff6 guibg=#1E415E - hi PmenuSel guifg=#dfeff6 guibg=#2D7889 - - " Search - hi IncSearch guifg=#E2DAEF guibg=#AF81F4 gui=bold - hi Search guifg=#E2DAEF guibg=#AF81F4 gui=none + hi CursorLine guibg=#18374F + hi CursorColumn guibg=#18374F + hi MatchParen guifg=magenta guibg=bg gui=bold + hi Pmenu guifg=#dfeff6 guibg=#1E415E + hi PmenuSel guifg=#dfeff6 guibg=#2D7889 + + hi IncSearch guifg=bg guibg=#AF81F4 gui=bold + hi Search guifg=bg guibg=#AF81F4 gui=none endif -" General colors -hi Cursor guifg=NONE guibg=#55A096 gui=none -"hi Normal guifg=#e3f3fa guibg=#102235 gui=none -hi Normal guifg=#e3f3fa guibg=#0B1724 gui=none -" e.g. tildes at the end of file -hi NonText guifg=#2F577C guibg=bg gui=none -hi LineNr guifg=#233f59 guibg=bg gui=none -hi StatusLine guifg=#ffec99 guibg=#0a1721 gui=none -hi StatusLineNC guifg=#233f59 guibg=#0a1721 gui=none -hi VertSplit guifg=#0a1721 guibg=#0a1721 gui=none +"""""""" General colors + +hi Cursor guifg=black guibg=#55A096 gui=none hi Folded guifg=#68CEE8 guibg=#1A3951 gui=none hi FoldColumn guifg=#1E415E guibg=#1A3951 gui=none -hi Title guifg=cyan guibg=NONE gui=bold +hi LineNr guifg=#1c3249 guibg=bg gui=none +hi Normal guifg=#e3f3fa guibg=#102235 gui=none +hi NonText guifg=#1c3249 guibg=bg gui=none +hi StatusLine guifg=#ffec99 guibg=#0a1721 gui=none +hi StatusLineNC guifg=#4e6f91 guibg=#0a1721 gui=none +hi TabLine guifg=#555555 guibg=#dddddd gui=none +hi TabLineSel guifg=#101010 guibg=#b0b0b0 gui=none +hi TabLineFill guifg=fg guibg=#dddddd gui=none +hi Title guifg=#ef7760 guibg=bg gui=none +hi VertSplit guifg=#0a1721 guibg=#0a1721 gui=none " Selected text color hi Visual guifg=#dfeff6 guibg=#24557A gui=none -"hi SpecialKey guifg=#3e71a1 guibg=#102235 gui=none - -" Syntax highlighting -" -hi Comment guifg=#3e71a1 guibg=bg gui=italic -hi Todo guifg=#ADED80 guibg=#579929 gui=bold -hi Constant guifg=#96defa gui=none -hi String guifg=#89e14b gui=italic - " names of variables in PHP -hi Identifier guifg=#8ac6f2 gui=none - " Function names as in python. currently purleish -hi Function guifg=#AF81F4 gui=none - " declarations of type, e.g. int blah -hi Type guifg=#41B2EA gui=none - " statement, such as 'hi' right here -hi Statement guifg=#68CEE8 gui=none -hi Keyword guifg=#8ac6f2 gui=none - " specified preprocessed words (like bold, italic etc. above) -hi PreProc guifg=#ef7760 gui=none -hi Number guifg=#96defa gui=none -hi Special guifg=#DFEFF6 gui=none - -" Ruby -hi rubyInterpolation guifg=#b9e19d guibg=bg -hi rubyInterpolationDelimiter guifg=#b9e19d guibg=bg -hi link rubyStringDelimiter String -""hi erubyDelimiter guifg=#f8c6bd guibg=bg -hi link erubyDelimiter PreProc - -" HTML -hi link htmlTag Statement -hi link htmlEndTag Statement -hi link htmlTagName Statement - -" XML -hi link xmlTag htmlTag -hi link xmlEndTag htmlEndTag -hi link xmlTagName htmlTagName - -" NERDTree -hi link treePart LineNr -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 markdownCode Function -hi link markdownCodeBlock Function + +hi ErrorMsg guifg=fg guibg=#C62626 +hi WarningMsg guifg=#C62626 guibg=bg + + + +"""""""" Syntax highlighting + +hi Comment guifg=#4e6f91 guibg=bg gui=italic +hi Constant guifg=#ffc287 guibg=bg gui=none +hi Function guifg=#AF81F4 guibg=bg gui=none +hi Identifier guifg=#889ce8 guibg=bg gui=none +hi Ignore guifg=bg guibg=bg gui=none +hi link Number Constant +hi PreProc guifg=#ef7760 guibg=bg gui=none +hi Keyword guifg=#8ac6f2 guibg=bg gui=none +hi Special guifg=#b9e19d guibg=bg gui=none +hi Statement guifg=#68CEE8 guibg=bg gui=none +hi String guifg=#89e14b guibg=bg gui=italic +hi Todo guifg=#ADED80 guibg=bg gui=bold +hi Type guifg=#5ba0eb guibg=bg gui=none +hi Underlined guifg=#8ac6f2 guibg=bg gui=underline + + +"""""""" Coffee + +hi link coffeeInterpolation Special + + +"""""""" 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 +hi link hamlInterpolation Special + + +"""""""" HTML + +hi link htmlTag Statement +hi link htmlEndTag Statement +hi link htmlTagName Statement +hi link htmlSpecialChar Constant + + +"""""""" JavaScript + +hi link javaScriptFunction Function +hi link javaScriptDocSeeTag Underlined + + +"""""""" Markdown - tpope's + +hi link markdownCodeBlock Statement +hi link markdownCode Statement +hi link markdownCodeDelimiter Statement +hi link markdownHeadingDelimiter Title +hi link markdownLinkText Underlined +hi link markdownLinkTextDelimiter Comment +hi link markdownLinkDelimiter Comment +hi link markdownListMarker Constant +hi link markdownUrl Comment + + +"""""""" NERDTree + +hi link treeClosable PreProc +hi link treeDir Statement +hi link treeDirSlash NonText +hi link treeExecFile Type +hi treeFlag guifg=#3e71a1 guibg=bg gui=none +hi link treeHelp Comment +hi link treeLink Type +hi link treePart NonText +hi link treePartFile NonText +hi link treeOpenable treeClosable +hi link treeUp treeClosable + + +"""""""" Ruby + +hi rubyAccess guifg=#ef7760 guibg=bg gui=italic +hi link rubyBlockParameter Normal +hi link rubyInterpolation Special +hi link rubyInterpolationDelimiter Special +hi link rubyStringDelimiter String + + +"""""""" SH + +hi link shQuote String + + +"""""""" XML + +hi link xmlEndTag htmlEndTag +hi link xmlTag htmlTag +hi link xmlTagName htmlTagName + +" vim: set sw=4 sts=4 et : diff --git a/.vim/colors/void.vim b/.vim/colors/void.vim new file mode 100644 index 0000000..06da9a0 --- /dev/null +++ b/.vim/colors/void.vim @@ -0,0 +1,109 @@ +" Vim color file +" Maintainer: Andrew Lyon +" Last Change: 2012-03-21 06:01:00 PST +" Version: 2.1 + +" Note that this color scheme is loosely based off of desert.vim (Hans Fugal +" ) mixed with some of slate.vim (Ralph Amissah +" ) but with much of my own modification. + +set background=dark +if version > 580 + " no guarantees for version 5.8 and below, but this makes it stop + " complaining + hi clear + if exists("syntax_on") + syntax reset + endif +endif +let g:colors_name="void" + +hi Normal guifg=#e0e0e0 guibg=grey15 + +" highlight groups +hi Cursor guibg=khaki guifg=slategrey +"hi CursorIM +"hi Directory +"hi DiffAdd +"hi DiffChange +"hi DiffDelete +"hi DiffText +"hi ErrorMsg +hi VertSplit guibg=black guifg=black gui=none +hi Folded guibg=grey30 guifg=gold +hi FoldColumn guibg=grey30 guifg=tan +hi IncSearch guifg=slategrey guibg=khaki +"hi LineNr +hi ModeMsg guifg=goldenrod +hi MoreMsg guifg=SeaGreen +hi NonText guifg=LightBlue guibg=grey30 +hi Question guifg=springgreen +hi Search guibg=peru guifg=wheat +hi SpecialKey guifg=yellowgreen +hi StatusLine guibg=black guifg=#cccccc gui=none +hi StatusLineNC guibg=black guifg=grey40 gui=none +hi Title guifg=indianred +hi Visual gui=none guifg=khaki guibg=olivedrab +"hi VisualNOS +hi WarningMsg guifg=salmon +"hi WildMenu +"hi Menu +"hi Scrollbar +"hi Tooltip + +" syntax highlighting groups +hi Comment guifg=grey50 ctermfg=darkcyan +hi Constant guifg=#e09085 ctermfg=brown +hi Identifier guifg=#d0d0b0 +hi Statement guifg=#ccaa88 gui=bold cterm=bold term=bold +"hi Statement guifg=darkkhaki +hi PreProc guifg=#c8e0b0 +hi Type guifg=#99cccc term=NONE cterm=NONE gui=NONE +hi Special guifg=#bbccee cterm=bold term=bold +hi Operator guifg=navajowhite cterm=NONE +"hi Underlined +hi Ignore guifg=grey40 +"hi Error +hi Todo guifg=orangered guibg=yellow2 +hi Todo guifg=orange guibg=gray40 + +" Fuf/menu stuff +hi Pmenu guifg=#aadddd guibg=#333333 +hi PmenuSel guifg=#ddeeee guibg=#335533 + +" color terminal definitions +hi SpecialKey ctermfg=darkgreen +hi NonText guibg=grey15 cterm=bold ctermfg=darkblue +hi Directory ctermfg=brown guifg=#ddbb66 +hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1 +hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green +hi Search cterm=NONE ctermfg=grey ctermbg=blue +hi MoreMsg ctermfg=darkgreen +hi ModeMsg cterm=NONE ctermfg=brown +hi LineNr guifg=grey50 ctermfg=3 +hi Question ctermfg=green +hi StatusLine cterm=bold,reverse +hi StatusLineNC cterm=reverse +hi VertSplit cterm=reverse +hi Title ctermfg=5 +hi Visual cterm=reverse +hi VisualNOS cterm=bold,underline +hi WarningMsg ctermfg=1 +hi WildMenu ctermfg=0 ctermbg=3 +hi Folded ctermfg=darkgrey ctermbg=NONE +hi FoldColumn ctermfg=darkgrey ctermbg=NONE +hi DiffAdd ctermbg=4 +hi DiffChange ctermbg=5 +hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 +hi DiffText cterm=bold ctermbg=1 +hi Special ctermfg=5 +hi Identifier ctermfg=6 +hi Statement ctermfg=3 +hi PreProc ctermfg=5 +hi Type ctermfg=2 +hi Underlined cterm=underline ctermfg=5 +hi Ignore cterm=bold ctermfg=7 +hi Ignore ctermfg=darkgrey +hi Error cterm=bold ctermfg=7 ctermbg=1 + + diff --git a/.vim/colors/vydark.vim b/.vim/colors/vydark.vim new file mode 100644 index 0000000..549c189 --- /dev/null +++ b/.vim/colors/vydark.vim @@ -0,0 +1,80 @@ +" +" Vim colour file +" +" Maintainer: Vy-Shane Sin Fat +" Version: 1.0 +" +" This colour file is meant for GUI use. +" + +set background=dark +hi clear +if exists("syntax_on") + syntax reset +endif +let g:colors_name="vydark" + + +hi Normal guifg=#bbbbbb guibg=#282828 +hi Title guifg=white +hi Cursor guibg=#ffffff +hi LineNr guifg=#444455 guibg=#292929 +hi Visual guibg=#555555 +hi NonText guifg=#292929 guibg=#292929 +hi StatusLine guifg=#bbbbbb guibg=#353535 gui=none +hi StatusLineNC guifg=#777777 guibg=#353535 gui=none +hi VertSplit guifg=#353535 guibg=#353535 gui=none +hi ModeMsg guifg=#99dd99 guibg=#394439 gui=none +hi ErrorMsg guifg=#222222 guibg=#ff8888 gui=none +hi Error guifg=#ffaaaa guibg=#333333 gui=none + + +" Vim 7.x specific +if version >= 700 + hi MatchParen guibg=#364836 gui=none + hi Pmenu guifg=#bbbbbb guibg=#444444 gui=none + hi PmenuSel guifg=#222222 guibg=#99bbdd gui=none + hi PmenuSbar guifg=#494949 guibg=#494949 gui=bold + hi PmenuThumb guifg=#666666 guibg=#666666 gui=bold + hi Search guifg=#dddd99 guibg=#444433 gui=none + hi IncSearch guifg=#eeeeaa guibg=#666633 gui=bold + hi CursorLine guibg=#353535 gui=none + hi ColorColumn guibg=#292929 +endif + + +" Syntax highlighting +hi Comment guifg=#666677 gui=none +hi Todo guifg=#8888aa guibg=#303030 gui=italic +hi Operator guifg=#bbbbbb gui=none +hi Identifier guifg=#bbbbbb gui=none +hi Statement guifg=#bbbbbb gui=none +hi Type guifg=#99bbcc gui=none +hi Constant guifg=#88cc99 gui=none +hi Conditional guifg=#99bbcc gui=none +hi Delimiter guifg=#99bbdd gui=none +hi PreProc guifg=#88ddcc gui=none +hi Special guifg=#99dd99 gui=bold +hi Keyword guifg=#bbbbbb gui=none + +hi link Function Normal +hi link Character Constant +hi link String Constant +hi link Boolean Constant +hi link Number Constant +hi link Float Number +hi link Repeat Conditional +hi link Label Statement +hi link Exception Statement +hi link Include Normal +hi link Define Type +hi link Macro PreProc +hi link PreCondit PreProc +hi link StorageClass Type +hi link Structure Type +hi link Typedef Type +hi link Tag Special +hi link SpecialChar Special +hi link SpecialComment Special +hi link Debug Special + diff --git a/.vim/colors/werks.vim b/.vim/colors/werks.vim new file mode 100644 index 0000000..b789837 --- /dev/null +++ b/.vim/colors/werks.vim @@ -0,0 +1,75 @@ +" Vim color file +" inspired by the desert color scheme by Hans Fugal +" Maintainer: Bidit Mazumder +" Last Change: December 5, 2009 + +" background +set background=dark +let g:colors_name="werks" + + +" highlight normal +hi Normal guifg=#F5E8D3 guibg=#333333 + + +" gui highlight cursor +hi iCursor guifg=#000000 guibg=#F5E8D3 +hi Cursor guifg=#FFFFFF guibg=#DAA520 + +set guicursor+=n-c:blinkwait800-iCursor + +set guicursor+=i-v:ver10-Cursor +set guicursor+=r:hor10-Cursor + +set guicursor+=ci:ver10-iCursor +set guicursor+=cr:hor10-iCursor + +set guicursor+=sm:iCursor +set guicursor+=o:hor50-Error + + +" highlight groups +hi DiffAdd guifg=#FAEBD7 guibg=#483D8B +hi DiffChange guifg=#FAEBD7 guibg=#B03060 +hi DiffDelete guifg=#FAEBD7 guibg=#00595A +hi DiffText guifg=#FAEBD7 guibg=#D2691E +hi Directory guifg=#00FFFF +hi ErrorMsg guifg=#F5F5F5 guibg=#8F0000 +hi FoldColumn guifg=#FFEC8B guibg=#4D4D4D +hi Folded guifg=#DAA520 guibg=#4D4D4D +hi IncSearch guifg=#708090 guibg=#F0E68C +hi LineNr guifg=#F3F2AE guibg=#4D4D4D +hi ModeMsg guifg=#FF4500 +hi MoreMsg guifg=#2E8B57 +hi NonText guifg=#4D4D4D +hi Question guifg=#90EE90 +hi Search guifg=#F5E8D3 guibg=#708090 +hi SignColumn guifg=#2F4F4F guibg=#8FBC8F +hi SpecialKey guifg=#C080D0 +hi StatusLine guifg=#000000 guibg=#C2BFA5 gui=none +hi StatusLineNC guifg=#666666 guibg=#C2BFA5 gui=none +hi Title guifg=#F5E8D3 +hi VertSplit guifg=#666666 guibg=#C2BFA5 gui=none +hi Visual guifg=#FAEBD7 guibg=#74873B gui=none +hi VisualNOS guifg=#FFFFFF +hi WarningMsg guifg=#DC143C +hi WildMenu guifg=#191970 guibg=#BBBB00 +"hi CursorIM +"hi Menu +"hi Scrollbar +"hi Tooltip +"hi Pmenu +"hi PmenuSel +"hi PmenuSbar +"hi PmenuThumb +"hi TabLine +"hi TabLineSel +"hi TabLineFill +"hi CursorColumn +"hi CursorLine + +" syntax highlighting groups +hi Error guifg=#F5F5F5 guibg=#8F0000 +hi Ignore guifg=#666666 +hi PreProc guifg=#CD5C5C +hi Todo guifg=#F0E68C guibg=#9400D3 diff --git a/.vim/colors/wombat.vim b/.vim/colors/wombat.vim new file mode 100644 index 0000000..9ad1e56 --- /dev/null +++ b/.vim/colors/wombat.vim @@ -0,0 +1,51 @@ +" 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/.vim/colors/xoria256-1.6.vim b/.vim/colors/xoria256-1.6.vim new file mode 100644 index 0000000..3be5b7e --- /dev/null +++ b/.vim/colors/xoria256-1.6.vim @@ -0,0 +1,145 @@ +" Vim color file +" +" Name: xoria256.vim +" Version: 1.6 +" Maintainer: Dmitriy Y. Zotikov (xio) +" +" Should work in recent 256 color terminals. 88-color terms like urxvt are +" NOT supported. +" +" Don't forget to install 'ncurses-term' and set TERM to xterm-256color or +" similar value. +" +" Color numbers (0-255) see: +" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html +" +" For a specific filetype highlighting rules issue :syntax list when a file of +" that type is opened. +" +" TODO: link colours instead of setting values explicitly + +" Initialization {{{ +if &t_Co != 256 && ! has("gui_running") + echoerr "Please use GUI or a 256-color terminal (which sets t_Co=256)." + finish +endif + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "xoria256" +"}}} +" Colours {{{1 +"" General {{{2 +hi Normal ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none +hi Cursor ctermbg=214 guibg=#ffaf00 +hi CursorColumn ctermbg=238 guibg=#444444 +hi CursorLine ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi Error ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 +hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 +hi FoldColumn ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi Folded ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi IncSearch ctermfg=0 guifg=#000000 ctermbg=223 guibg=#ffdfaf cterm=none gui=none +hi LineNr ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi MatchParen ctermfg=188 guifg=#dfdfdf ctermbg=68 guibg=#5f87df cterm=bold gui=bold +" TODO +" hi MoreMsg +hi NonText ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 cterm=bold gui=bold +hi Pmenu ctermfg=0 guifg=#000000 ctermbg=250 guibg=#bcbcbc +hi PmenuSel ctermfg=255 guifg=#eeeeee ctermbg=243 guibg=#767676 +hi PmenuSbar ctermbg=252 guibg=#d0d0d0 +hi PmenuThumb ctermfg=243 guifg=#767676 +hi Search ctermfg=0 guifg=#000000 ctermbg=149 guibg=#afdf5f +hi SignColumn ctermfg=248 guifg=#a8a8a8 +hi SpecialKey ctermfg=77 guifg=#5fdf5f +hi SpellBad ctermfg=160 guifg=fg ctermbg=bg cterm=underline guisp=#df0000 +hi SpellCap ctermfg=189 guifg=#dfdfff ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellRare ctermfg=168 guifg=#df5f87 ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellLocal ctermfg=98 guifg=#875fdf ctermbg=bg guibg=bg cterm=underline gui=underline +hi StatusLine ctermfg=15 guifg=#ffffff ctermbg=239 guibg=#4e4e4e cterm=bold gui=bold +hi StatusLineNC ctermfg=249 guifg=#b2b2b2 ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi TabLine ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=none gui=none +hi TabLineFill ctermfg=fg guifg=fg ctermbg=237 guibg=#3a3a3a cterm=none gui=none +" FIXME +hi Title ctermfg=225 guifg=#ffdfff +hi Todo ctermfg=0 guifg=#000000 ctermbg=184 guibg=#dfdf00 +hi Underlined ctermfg=39 guifg=#00afff cterm=underline gui=underline +hi VertSplit ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none +" hi VIsualNOS ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff cterm=none gui=none +" hi Visual ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff +hi Visual ctermfg=255 guifg=#eeeeee ctermbg=96 guibg=#875f87 +" hi Visual ctermfg=255 guifg=#eeeeee ctermbg=24 guibg=#005f87 +hi VisualNOS ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi WildMenu ctermfg=0 guifg=#000000 ctermbg=150 guibg=#afdf87 cterm=bold gui=bold + +"" Syntax highlighting {{{2 +" hi Comment ctermfg=244 guifg=#808080 +hi Comment ctermfg=150 guifg=#afdf87 +hi Constant ctermfg=229 guifg=#ffffaf +hi Identifier ctermfg=182 guifg=#dfafdf cterm=none +hi Ignore ctermfg=238 guifg=#444444 +hi Number ctermfg=180 guifg=#dfaf87 +" hi PreProc ctermfg=150 guifg=#afdf87 +hi PreProc ctermfg=152 guifg=#afdfdf +hi Special ctermfg=174 guifg=#df8787 +hi Statement ctermfg=110 guifg=#87afdf cterm=none gui=none +hi Type ctermfg=146 guifg=#afafdf cterm=none gui=none + +"" Special {{{2 +""" .diff {{{3 +hi diffAdded ctermfg=150 guifg=#afdf87 +hi diffRemoved ctermfg=174 guifg=#df8787 +""" vimdiff {{{3 +hi diffAdd ctermfg=bg guifg=bg ctermbg=151 guibg=#afdfaf +"hi diffDelete ctermfg=bg guifg=bg ctermbg=186 guibg=#dfdf87 cterm=none gui=none +hi diffDelete ctermfg=bg guifg=bg ctermbg=246 guibg=#949494 cterm=none gui=none +hi diffChange ctermfg=bg guifg=bg ctermbg=181 guibg=#dfafaf +hi diffText ctermfg=bg guifg=bg ctermbg=174 guibg=#df8787 cterm=none gui=none +""" HTML {{{3 +" hi htmlTag ctermfg=146 guifg=#afafdf +" hi htmlEndTag ctermfg=146 guifg=#afafdf +hi htmlTag ctermfg=244 +hi htmlEndTag ctermfg=244 +hi htmlArg ctermfg=182 guifg=#dfafdf +hi htmlValue ctermfg=187 guifg=#dfdfaf +hi htmlTitle ctermfg=254 ctermbg=95 +" hi htmlArg ctermfg=146 +" hi htmlTagName ctermfg=146 +" hi htmlString ctermfg=187 +""" django {{{3 +hi djangoVarBlock ctermfg=180 +hi djangoTagBlock ctermfg=150 +hi djangoStatement ctermfg=146 +hi djangoFilter ctermfg=174 +""" python {{{3 +hi pythonExceptions ctermfg=174 +""" NERDTree {{{3 +hi Directory ctermfg=110 guifg=#87afdf +hi treeCWD ctermfg=180 guifg=#dfaf87 +hi treeClosable ctermfg=174 guifg=#df8787 +hi treeOpenable ctermfg=150 guifg=#afdf87 +hi treePart ctermfg=244 guifg=#808080 +hi treeDirSlash ctermfg=244 guifg=#808080 +hi treeLink ctermfg=182 guifg=#dfafdf +""" rst #{{{3 +hi link rstEmphasis Number + +""" VimDebug {{{3 +" FIXME +" you may want to set SignColumn highlight in your .vimrc +" :help sign +" :help SignColumn + +" hi currentLine term=reverse cterm=reverse gui=reverse +" hi breakPoint term=NONE cterm=NONE gui=NONE +" hi empty term=NONE cterm=NONE gui=NONE + +" sign define currentLine linehl=currentLine +" sign define breakPoint linehl=breakPoint text=>> +" sign define both linehl=currentLine text=>> +" sign define empty linehl=empty diff --git a/.vim/colors/xorium.vim b/.vim/colors/xorium.vim new file mode 100644 index 0000000..9eee231 --- /dev/null +++ b/.vim/colors/xorium.vim @@ -0,0 +1,118 @@ +" Vim color file +" +" Name: xorium.vim +" Version: 1.0 +" Maintainer: AUAnonymous +" +" Based off of Dmitriy Y. Zotikov's (xio, ) xoria256 +" +" Should work in recent 256 color terminals. 88-color terms like urxvt are +" NOT supported. +" +" Don't forget to install 'ncurses-term' and set TERM to xterm-256color or +" similar value. +" +" Color numbers (0-255) see: +" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html +" +" For a specific filetype highlighting rules issue :syntax list when a file of +" that type is opened. +" +" Initialization {{{ +if &t_Co != 256 && ! has("gui_running") + echomsg "" + echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)" + echomsg "" + finish +endif + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "xorium" + +" Group ctermfg guifg ctermbg guibg cterm gui +hi Normal ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none +hi Cursor ctermbg=214 guibg=#ffaf00 +hi CursorColumn ctermbg=236 guibg=#2c2c2c +hi CursorLine ctermbg=236 guibg=#2c2c2c cterm=none gui=none +hi Error ctermfg=15 guifg=#ffffff ctermbg=88 guibg=#800000 +hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=88 guibg=#800000 +hi FoldColumn ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi Folded ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi IncSearch ctermfg=0 guifg=#000000 ctermbg=223 guibg=#ffdfaf cterm=none gui=none +hi LineNr ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi MatchParen ctermfg=188 guifg=#dfdfdf ctermbg=68 guibg=#5f87df cterm=none gui=none +" TODO +" hi MoreMsg +hi NonText ctermfg=236 guifg=#2c2c2c ctermbg=234 cterm=none gui=none +hi Pmenu ctermfg=0 guifg=#000000 ctermbg=250 guibg=#bcbcbc +hi PmenuSel ctermfg=255 guifg=#eeeeee ctermbg=243 guibg=#767676 +hi PmenuSbar ctermbg=252 guibg=#d0d0d0 +hi PmenuThumb ctermfg=243 guifg=#767676 +hi Search ctermfg=0 guifg=#000000 ctermbg=149 guibg=#afdf5f ctermbg=149 +hi SignColumn ctermfg=248 guifg=#a8a8a8 +hi SpecialKey ctermfg=237 guifg=#3d3d3d +hi SpellBad ctermfg=160 guifg=fg ctermbg=bg cterm=underline guisp=#df0000 +hi SpellCap ctermfg=189 guifg=#dfdfff ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellRare ctermfg=168 guifg=#df5f87 ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellLocal ctermfg=98 guifg=#875fdf ctermbg=bg guibg=bg cterm=underline gui=underline +hi StatusLine ctermfg=15 guifg=#ffffff ctermbg=239 guibg=#4e4e4e cterm=bold gui=none +hi StatusLineNC ctermfg=249 guifg=#b2b2b2 ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi TabLine ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=none gui=none +hi TabLineFill ctermfg=fg guifg=fg ctermbg=237 guibg=#3a3a3a cterm=none gui=none +" FIXME +hi Title ctermfg=225 guifg=#ffdfff +hi TODO ctermfg=0 guifg=#000000 ctermbg=220 guibg=#ffc400 +hi Underlined ctermfg=39 guifg=#00afff cterm=underline gui=underline +hi VertSplit ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi Visual ctermfg=234 guifg=#202020 ctermbg=220 guibg=#FFD000 +hi VisualNOS ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi WildMenu ctermfg=0 guifg=#000000 ctermbg=150 guibg=#afdf87 cterm=bold gui=bold + +"" Syntax highlighting {{{2 +hi comment ctermfg=66 guifg=#5f7682 +hi constant ctermfg=111 guifg=#94bbff +hi Identifier ctermfg=212 guifg=#f786ea cterm=none +hi Ignore ctermfg=238 guifg=#444444 +hi number ctermfg=028 guifg=#ed7715 +hi preproc ctermfg=149 guifg=#a1de6f +hi Special ctermfg=174 guifg=#eb8181 +hi Statement ctermfg=227 guifg=#ffff70 cterm=none gui=none +hi type ctermfg=104 guifg=#9b9bde cterm=none gui=none + +"" Special {{{2 +""" .diff {{{3 +hi diffAdded ctermfg=150 guifg=#afdf87 +hi diffRemoved ctermfg=174 guifg=#df8787 +""" vimdiff {{{3 +hi diffAdd ctermfg=bg guifg=bg ctermbg=151 guibg=#afdfaf +hi diffDelete ctermfg=bg guifg=bg ctermbg=246 guibg=#949494 cterm=none gui=none +hi diffChange ctermfg=bg guifg=bg ctermbg=181 guibg=#dfafaf +hi diffText ctermfg=bg guifg=bg ctermbg=174 guibg=#df8787 cterm=none gui=none +""" HTML {{{3 +hi htmlTag ctermfg=244 +hi htmlEndTag ctermfg=244 +hi htmlArg ctermfg=182 guifg=#dfafdf +hi htmlValue ctermfg=187 guifg=#dfdfaf +hi htmlTitle ctermfg=254 ctermbg=95 +""" django {{{3 +hi djangoVarBlock ctermfg=180 +hi djangoTagBlock ctermfg=150 +hi djangoStatement ctermfg=146 +hi djangoFilter ctermfg=174 +""" python {{{3 +hi pythonExceptions ctermfg=174 +""" NERDTree {{{3 +hi Directory ctermfg=110 guifg=#87afdf +hi treeCWD ctermfg=180 guifg=#dfaf87 +hi treeClosable ctermfg=174 guifg=#df8787 +hi treeOpenable ctermfg=150 guifg=#afdf87 +hi treePart ctermfg=244 guifg=#808080 +hi treeDirSlash ctermfg=244 guifg=#808080 +hi treeLink ctermfg=182 guifg=#dfafdf diff --git a/.vim/colors/zazen.vim b/.vim/colors/zazen.vim new file mode 100644 index 0000000..394b9d0 --- /dev/null +++ b/.vim/colors/zazen.vim @@ -0,0 +1,164 @@ +" ============================================================================= +" File: zazen.vim +" Description: Vim color scheme file +" Maintainer: Zoltan Dezso +" ============================================================================= +set background=dark +highlight clear +if exists("syntax_on") + syntax reset +endif +let colors_name = "zazen" + +hi Normal guifg=#cccccc guibg=#000000 gui=NONE +hi CursorLine guifg=NONE guibg=#555555 gui=NONE +hi CursorColumn guifg=NONE guibg=#1a1a1a gui=NONE +hi LineNr guifg=#555555 guibg=NONE gui=NONE +hi Statement guifg=#a6a6a6 guibg=NONE gui=bold +hi Function guifg=#eeeeee guibg=NONE gui=bold +hi String guifg=#838383 guibg=NONE gui=NONE +hi Type guifg=#eeeeee guibg=NONE gui=bold +hi Conditional guifg=#787878 guibg=NONE gui=bold +hi Todo guifg=#ff0000 guibg=#220000 gui=underline +hi Comment guifg=#777777 guibg=NONE gui=NONE +hi PmenuSel guifg=#000000 guibg=#a9a9aa gui=bold +hi Special guifg=#868585 guibg=NONE gui=NONE +hi Identifier guifg=#ffffff guibg=NONE gui=bold +hi Keyword guifg=#666666 guibg=NONE gui=bold +hi PreProc guifg=#6b6b6b guibg=NONE gui=bold +hi Include guifg=#e0e0e0 guibg=NONE gui=NONE +hi Constant guifg=#838383 guibg=#222222 gui=bold +hi Delimiter guifg=#838383 guibg=NONE gui=NONE + +hi Visual guifg=#ffffff guibg=#515151 gui=NONE +hi ColorColumn guifg=NONE guibg=#222222 +hi Cursor guifg=bg guibg=fg gui=NONE +hi CursorIM guifg=bg guibg=fg gui=NONE +hi lCursor guifg=bg guibg=fg gui=NONE + +hi DiffAdd guifg=#00cc00 guibg=#002200 gui=NONE +hi DiffChange guifg=#ff9955 guibg=#220000 gui=NONE +hi DiffDelete guifg=#ff0000 guibg=#220000 gui=NONE +hi DiffText guifg=#ff0000 guibg=#220000 gui=NONE + +hi Directory guifg=#929292 guibg=bg gui=NONE +hi ErrorMsg guifg=#6f6f6f guibg=NONE gui=NONE +hi FoldColumn guifg=#555555 guibg=#414141 gui=bold +hi Folded guifg=#828282 guibg=#212121 gui=italic + +hi IncSearch guifg=#000000 guibg=#adadad gui=NONE +hi Search guifg=#000000 guibg=#c5c3c3 gui=NONE +hi MatchParen guifg=#000000 guibg=#a8a8a8 gui=bold +hi ModeMsg guifg=#ffffff guibg=#767676 gui=bold +hi MoreMsg guifg=#7c7c7c guibg=bg gui=bold +hi NonText guifg=#7e7e7e guibg=bg gui=bold + +hi Pmenu guifg=#656565 guibg=#3f3f3f gui=NONE +hi PmenuSbar guifg=fg guibg=#5d5d5d gui=NONE +hi PmenuThumb guifg=fg guibg=#777777 gui=NONE + +hi Question guifg=#454545 guibg=bg gui=bold +hi SignColumn guifg=#ffffff guibg=#696969 gui=NONE + +hi SpecialKey guifg=#ffffff guibg=#696969 gui=NONE + +hi SpellBad guisp=#ffffff guibg=#000000 gui=undercurl guisp=#ffc0c0 +hi SpellCap guisp=#5d5d5d gui=undercurl +hi SpellLocal guisp=#434343 gui=undercurl +hi SpellRare guisp=#7d7d7d gui=undercurl +hi StatusLine guifg=#000000 guibg=#727272 gui=bold +hi StatusLineNC guifg=#5a5959 guibg=#222222 gui=italic +hi TabLine guifg=fg guibg=#757575 gui=underline +hi TabLineFill guifg=fg guibg=bg gui=reverse +hi TabLineSel guifg=fg guibg=bg gui=bold +hi Title guifg=#6d6d6d guibg=bg gui=bold +hi VertSplit guifg=#222222 guibg=#222222 +hi WarningMsg guifg=#cfcfcf guibg=#5b5b5b gui=NONE +hi WildMenu guifg=#000000 guibg=#828282 gui=NONE +hi Boolean guifg=#616060 guibg=NONE gui=bold +hi Ignore guifg=bg guibg=NONE gui=NONE +hi Error guifg=#ff7272 guibg=NONE gui=undercurl guisp=#ff0000 +" ----------------------------------------------------------------------------- +hi VimError guifg=#b6b6b6 guibg=#313131 gui=bold +hi VimCommentTitle guifg=#5c5c5c guibg=bg gui=bold,italic +hi qfFileName guifg=#6a6a6a guibg=NONE gui=italic +hi qfLineNr guifg=fg guibg=NONE gui=NONE +hi qfError guifg=fg guibg=#000000 gui=undercurl + +" 256-color Terminal support +if &t_Co > 255 + hi Normal ctermfg=251 ctermbg=0 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=240 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=234 cterm=NONE + hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE + hi Statement ctermfg=248 ctermbg=NONE cterm=bold + hi Function ctermfg=255 ctermbg=NONE cterm=bold + hi String ctermfg=244 ctermbg=NONE cterm=NONE + hi Type ctermfg=255 ctermbg=NONE cterm=bold + hi Conditional ctermfg=243 ctermbg=NONE cterm=bold + hi Todo ctermfg=9 ctermbg=NONE cterm=underline + hi Comment ctermfg=243 ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=0 ctermbg=248 cterm=bold + hi Special ctermfg=244 ctermbg=NONE cterm=NONE + hi Identifier ctermfg=15 ctermbg=NONE cterm=bold + hi Keyword ctermfg=242 ctermbg=NONE cterm=bold + hi PreProc ctermfg=242 ctermbg=NONE cterm=bold + hi Include ctermfg=254 ctermbg=NONE cterm=NONE + hi Constant ctermfg=244 ctermbg=235 cterm=bold + hi Delimiter ctermfg=244 ctermbg=NONE cterm=NONE + + hi Visual ctermfg=15 ctermbg=239 cterm=NONE + hi ColorColumn ctermfg=NONE ctermbg=234 + hi Cursor ctermfg=bg ctermbg=fg cterm=NONE + hi CursorIM ctermfg=bg ctermbg=fg cterm=NONE + hi lCursor ctermfg=bg ctermbg=fg cterm=NONE + + hi DiffAdd ctermfg=40 ctermbg=22 cterm=NONE + hi DiffChange ctermfg=209 ctermbg=52 cterm=NONE + hi DiffDelete ctermfg=9 ctermbg=52 cterm=NONE + hi DiffText ctermfg=9 ctermbg=52 cterm=NONE + + hi Directory ctermfg=246 ctermbg=bg cterm=NONE + hi ErrorMsg ctermfg=242 ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=240 ctermbg=237 cterm=bold + hi Folded ctermfg=244 ctermbg=234 cterm=italic + + hi IncSearch ctermfg=0 ctermbg=248 cterm=NONE + hi Search ctermfg=0 ctermbg=251 cterm=NONE + hi MatchParen ctermfg=0 ctermbg=248 cterm=bold + hi ModeMsg ctermfg=15 ctermbg=243 cterm=bold + hi MoreMsg ctermfg=243 ctermbg=bg cterm=bold + hi NonText ctermfg=244 ctermbg=bg cterm=bold + + hi Pmenu ctermfg=242 ctermbg=237 cterm=NONE + hi PmenuSbar ctermfg=fg ctermbg=241 cterm=NONE + hi PmenuThumb ctermfg=fg ctermbg=243 cterm=NONE + + hi Question ctermfg=238 ctermbg=bg cterm=bold + hi SignColumn ctermfg=15 ctermbg=242 cterm=NONE + + hi SpecialKey ctermfg=15 ctermbg=242 cterm=NONE + + hi SpellBad ctermbg=0 cterm=NONE + hi SpellCap ctermbg=0 cterm=NONE + hi SpellLocal ctermbg=0 cterm=NONE + hi SpellRare ctermbg=0 cterm=NONE + hi StatusLine ctermfg=0 ctermbg=243 cterm=bold + hi StatusLineNC ctermfg=241 ctermbg=235 cterm=italic + hi TabLine ctermfg=fg ctermbg=243 cterm=underline + hi TabLineFill ctermfg=fg ctermbg=bg cterm=reverse + hi TabLineSel ctermfg=fg ctermbg=bg cterm=bold + hi Title ctermfg=242 ctermbg=bg cterm=bold + hi VertSplit ctermfg=234 ctermbg=234 + hi WarningMsg ctermfg=252 ctermbg=240 cterm=NONE + hi WildMenu ctermfg=0 ctermbg=244 cterm=NONE + hi Boolean ctermfg=241 ctermbg=NONE cterm=bold + hi Ignore ctermfg=bg ctermbg=NONE cterm=NONE + hi Error ctermfg=210 ctermbg=NONE cterm=underline + + hi VimError ctermfg=250 ctermbg=236 cterm=bold + hi VimCommentTitle ctermfg=240 ctermbg=bg cterm=bold,italic + hi qfFileName ctermfg=242 ctermbg=NONE cterm=italic + hi qfLineNr ctermfg=fg ctermbg=NONE cterm=NONE + hi qfError ctermfg=fg ctermbg=0 cterm=underline +end diff --git a/.vim/dict.add b/.vim/dict.add index e2840b6..b6af5fe 100644 --- a/.vim/dict.add +++ b/.vim/dict.add @@ -10,3 +10,21 @@ app Ubuntu blog unicode +plugin +plugins +ajax +json +hotalert +hotalerts +HotAlert +SqlAlchemy +admin +popup +username +Codemash +added +actions +buildout +$/! +refactor +MongoDB diff --git a/.vim/dict.add.spl b/.vim/dict.add.spl new file mode 100644 index 0000000..a5072ac Binary files /dev/null and b/.vim/dict.add.spl differ diff --git a/.vimrc b/.vimrc index 6c77536..e6878b5 100644 --- a/.vimrc +++ b/.vimrc @@ -12,8 +12,8 @@ " ================================================== " jj - esc " ,b - bufferlist -" ,v - load .vimrc -" ,V - reload .vimrc +" ,V - load .vimrc +" ,VV - reload .vimrc " ,m - run make " ,M - alt make for filetype (pep8 for python, etc) " ,y - yank to clipboard @@ -83,6 +83,14 @@ filetype off call pathogen#runtime_append_all_bundles() call pathogen#helptags() +" Highlight end of line whitespace. +" match WhitespaceEOL /\s\+$/ +au InsertEnter * match WhitespaceEOL /\s\+$/ +au InsertLeave * match WhitespaceEOL /\s\+$/ + +" make sure our whitespace matching is setup before we do colorscheme tricks +autocmd ColorScheme * highlight WhitespaceEOL ctermbg=red guibg=red + " now proceed as usual syntax on " syntax highlighing filetype on " try to detect filetypes @@ -90,20 +98,35 @@ filetype plugin indent on " enable loading indent file for filetype " In GVIM if has("gui_running") - set guifont=Liberation\ Mono\ 8" use this font + " set guifont=Consolas\ 7" use this font + " set guifont=Liberation\ Mono\ 7" use this font + set guifont=Ubuntu\ Mono\ 10" use this font set lines=75 " height = 50 lines set columns=180 " width = 100 columns - set background=dark " adapt colors for background + set background=light " adapt colors for background set keymodel= - set mousehide - colorscheme underwater-mod + set nomousehide + " colorscheme lucius + " colorscheme twilight + " colorscheme solarized + " colorscheme void + colorscheme aldmeris + " colorscheme smyck " To set the toolbars off (icons on top of the screen) - set guioptions-=T + " set guioptions-=T + " + " set guioptions-=m "remove menu bar + set guioptions= + + " Try to keep backups across sessions + set undodir=~/.vim/backups + set undofile else - set background=dark " adapt colors for dark background - colorscheme lucius + set background=light " adapt colors for dark background set t_Co=256 + colorscheme lucius + endif @@ -111,8 +134,8 @@ endif " Basic Settings " ================================================== let mapleader="," " change the leader to be a comma vs slash -set textwidth=80 " Try this out to see how textwidth helps -set ch=3 " Make command line two lines high +set textwidth=78 " Try this out to see how textwidth helps +set ch=1 " Make command line two lines high set ls=2 " allways show status line set tabstop=4 " numbers of spaces of tab character set shiftwidth=4 " numbers of spaces to (auto)indent @@ -141,6 +164,8 @@ set expandtab " tabs are converted to spaces, use only when required set sm " show matching braces, somewhat annoying... set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]\ [POS=%04l,%04v][%p%%]\ [LEN=%L] +hi StatusLine guifg=#fcf4ba guibg=#333333 +hi StatusLineNC guifg=#808080 guibg=#333333 " move freely between files set whichwrap=b,s,h,l,<,>,[,] @@ -158,6 +183,12 @@ set pastetoggle= " replace the default grep program with ack set grepprg=ack-grep +" auto save when focus is lost +au FocusLost * :wa + +" run the current file with F5 +map :w:!%:p + " ================================================== " Config Specific Settings " ================================================== @@ -167,26 +198,28 @@ if &diff set nospell endif - " ================================================== " Basic Maps " ================================================== - +" " Maps for jj to act as Esc ino jj cno jj +" Map ;; to swap out the file with the previous one +nnoremap ;; + " map ctrl-c to something else so I quick using it map imap -" ,v brings up my .vimrc +" ,VV brings up my .vimrc " ,V reloads it -- making all changes active (have to save first) -map v :sp ~/.vimrc_ -map V :source ~/.vimrc:filetype detect:exe ":echo 'vimrc reloaded'" +map V :sp ~/.vimrc_ +map VV :source ~/.vimrc:filetype detect:exe ":echo 'vimrc reloaded'" " Run Make with ctrl-m or ,m -map m :make +map m :make:cw " quick insertion of a newline nmap o @@ -224,16 +257,24 @@ nmap s :setlocal spell! spelllang=en_us " zw = mark word as not spelled correctly (remove) set spellfile=~/.vim/dict.add - " shortcuts to open/close the quickfix window nmap c :copen nmap cc :cclose +nmap l :lopen +nmap ll :lclose +nmap ln :lN +nmap lp :lN + " for when we forget to use sudo to open/edit a file cmap w!! w !sudo tee % >/dev/null nnoremap q gqap +" Scroll the viewport 3 lines vs just 1 line at a time +nnoremap 3 +nnoremap 3 + " ================================================== " Windows / Splits " ================================================== @@ -244,10 +285,6 @@ map k map l map h -" Hints for other movements -" rotate window to next spot -" swap window with current one - " and lets make these all work in insert mode too ( makes next cmd " happen as if in command mode ) imap @@ -263,26 +300,6 @@ map < " F2 close current window (commonly used with my F1/F3 functions) noremap :close -" mapping to make movements operate on 1 screen line in wrap mode -function! ScreenMovement(movement) - if &wrap - return "g" . a:movement - else - return a:movement - endif -endfunction -onoremap j ScreenMovement("j") -onoremap k ScreenMovement("k") -onoremap 0 ScreenMovement("0") -onoremap ^ ScreenMovement("^") -onoremap $ ScreenMovement("$") -nnoremap j ScreenMovement("j") -nnoremap k ScreenMovement("k") -nnoremap 0 ScreenMovement("0") -nnoremap ^ ScreenMovement("^") -nnoremap $ ScreenMovement("$") - - " ================================================== " Search " ================================================== @@ -295,14 +312,8 @@ set smartcase " if searching and search contains upper case, make case nmap :silent noh - -" Highlight end of line whitespace. -highlight WhitespaceEOL ctermbg=red guibg=red -match WhitespaceEOL /\s\+$/ - -" Clean all end of line extra whitespace with ,S -:nnoremap S :let _s=@/:%s/\s\+$//e:let @/=_s:nohl - +" Search for potentially strange non-ascii characters +map u :match Error /[\x7f-\xff]/ " ================================================== " Completion @@ -318,18 +329,16 @@ set complete+=t set completeopt+=menuone,longest -let g:SuperTabDefaultCompletionType = "context" -let g:SuperTabContextDefaultCompletionType = "" -let g:SuperTabLongestHighlight = 1 -let g:SuperTabMidWordCompletion = 1 - - " ================================================== " Filetypes " ================================================== " Auto change the directory to the current file I'm working on -autocmd BufEnter * lcd %:p:h +" autocmd BufEnter * lcd %:p:h +" Trying out this trick to get cwd tricks +cnoremap %% =expand('%:h').'/' +map e :edit %% +map v :view %% " make the smarty .tpl files html files for our purposes au BufNewFile,BufRead *.tpl set filetype=html @@ -357,18 +366,35 @@ au bufwritepost * if getline(1) =~ "^#!" | if getline(1) =~ "/bin/" | silent !ch " ================================================== " Python " ================================================== -au BufRead *.py set makeprg=python\ -c\ \"import\ py_compile,sys;\ sys.stderr=sys.stdout;\ py_compile.compile(r'%')\" -au BufRead *.py set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m +au BufReadPost quickfix map :.cc :ccl +au BufRead *.py set makeprg=python\ -c\ \"import\ py_compile,sys;\ sys.stderr=sys.stdout;\ py_compile.compile(r'%')\" +autocmd FileType python map M :SyntasticCheck +" au BufRead *.py compiler nose +" au BufRead *.py set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m +au BufRead *.py set tags=tags-py;/ " ================================================== " Javascript " ================================================== au FileType javascript call JavaScriptFold() au FileType javascript setl fen +au FileType javascript set errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m +au FileType javascript set makeprg=jshint\ % +autocmd FileType javascript map M :SyntasticCheck +au FileType javascript set tags=tags-js;/ +au FileType javascript set formatoptions-=r + +autocmd BufRead,BufNewFile *.json set filetype=json +command Js silent %!jp +command Jc silent %!jcompress +autocmd FileType json Js + +" ================================================== +" CSS +" ================================================== + -au BufRead *.js set makeprg=jslint\ % -au BufRead,BufNewFile jquery.*.js set ft=javascript syntax=jquery " ================================================== @@ -377,9 +403,27 @@ au BufRead,BufNewFile jquery.*.js set ft=javascript syntax=jquery " enable a shortcut for tidy using ~/.tidyrc config map T :!tidy -config ~/.tidyrc -" enable html tag folding with ,t +" enable html tag folding with ,f nnoremap f Vatzf +map g :!google-chrome % + +" ================================================== +" GoLang +" ================================================== +" Highlight word and 'K' to get GoDoc output for word. +au BufRead,BufNewFile *.go set filetype=go +" ,m will run gomake +au BufRead *.go set makeprg=gomake +" ,M will run gofmt on the code to lint it +autocmd FileType go map M :Fmt:cw + +" ================================================== +" Git Tricks +" ================================================== +" Show the diff in the preview window of the commit during git commit +autocmd FileType gitcommit DiffGitCached | wincmd p + " ================================================== " Syntax Files " ================================================== @@ -398,6 +442,33 @@ nnoremap f Vatzf " Plugins " ================================================== +" CtrlP +" https://github.com/kien/ctrlp.vim +let g:ctrlp_working_path_mode = 0 +let g:ctrlp_custom_ignore = { + \ 'dir': '\.git$\|\.hg$\|\.svn\|\.bzr$\|develop-eggs$\|site-packages', + \ 'file': '\.pyc$|\.exe$\|\.so$\|\.dll$\|\.swp$', + \ 'link': 'download-cache|eggs|yui', + \ } + +map gt :CtrlP templates/ +map gj :CtrlP static/js/ + +" Fugative +" https://github.com/tpope/vim-fugitive +" +" Commands: +" Gedit +" Gsplit +" Gvsplit +" GStatus +" Gblame +" Gmove +" Gremove +" Ggrep +" Gwrite +" Gbrowse + " lusty-juggler " http://www.vim.org/scripts/script.php?script_id=2050 nmap b :LustyJuggler @@ -405,7 +476,7 @@ nmap b :LustyJuggler " NERDTree " http://www.vim.org/scripts/script.php?script_id=1658 let NERDTreeIgnore = ['\.pyc$', '\.pyo$'] -map t :NERDTree +map a :NERDTree " tComment " http://www.vim.org/scripts/script.php?script_id=1173 @@ -414,7 +485,7 @@ map t :NERDTree " pep8 " http://www.vim.org/scripts/script.php?script_id=2914 -autocmd FileType python map M :call Pep8() +" autocmd FileType python map M :call Pep8():cw " python folding jpythonfold.vim @@ -430,18 +501,23 @@ autocmd FileType python map M :call Pep8() " Supertab " http://www.vim.org/scripts/script.php?script_id=182 " :SuperTabHelp +let g:SuperTabDefaultCompletionType = "context" +let g:SuperTabContextDefaultCompletionType = "" +let g:SuperTabLongestHighlight = 1 +let g:SuperTabMidWordCompletion = 1 " SnipMate " http://www.vim.org/scripts/script.php?script_id=2540 " ,, - complete and tab to next section " ,n - show list of snippets for this filetype + +" bundle/snipmate/after/plugin/snipmate ino , =TriggerSnippet() snor , i=TriggerSnippet() ino \< =BackwardsSnippet() snor \< i=BackwardsSnippet() ino n =ShowAvailableSnips() - " Surround " http://www.vim.org/scripts/script.php?script_id=1697 " default shortcuts @@ -449,31 +525,60 @@ ino n =ShowAvailableSnips() " Pyflakes " http://www.vim.org/scripts/script.php?script_id=3161 " default config for underlines of syntax errors in gvim +let g:pyflakes_use_quickfix = 0 + +" tslime +" https://github.com/evhan/tslime.vim.git +" let g:tmux_sessionname = "default" +let g:tmux_windowname = 1 +let g:tmux_panenumber = 0 +nmap mt :call Send_to_Tmux("make test"."\n") +nmap lt :call Send_to_Tmux("./bin/test -x -cvvt \"test_".expand("%:t:r")."\"\n") +nmap rst :call Send_to_Tmux("rst2html.py ".expand("%")." > /tmp/".expand("%:t:r").".html\n") + " Gist - github pastbin " http://www.vim.org/scripts/script.php?script_id=2423 " :Gist " :Gist -p (private) +" :Gist -l " :Gist XXXX (fetch Gist XXXX and load) let g:gist_detect_filetype = 1 let g:gist_open_browser_after_post = 1 -" TwitVim -" http://vim.sourceforge.net/scripts/script.php?script_id=2204 -" Twitter/Identica client for vim -" F7/F8 for loading identica/twitter -"source ~/.vim/twitvim.vim - " RopeVim " http://rope.sourceforge.net/ropevim.html " Refactoring engine using python-rope -source /usr/local/ropevim.vim +" source /usr/local/ropevim.vim +source /usr/local/share/vim/plugin/ropevim.vim let ropevim_codeassist_maxfixes=10 let ropevim_vim_completion=1 let ropevim_guess_project=1 let ropevim_enable_autoimport=1 let ropevim_extended_complete=1 +" Tagbar +" https://github.com/majutsushi/tagbar/ +" Show ctags info in the sidebar +nmap L :TagbarToggle + +" Syntastic +" Config syntastic + +let g:syntastic_check_on_open=1 +let g:syntastic_enable_signs=0 +let g:syntastic_enable_highlighting=1 +let g:syntastic_auto_loc_list=1 +let g:syntastic_loc_list_height=5 + +" let g:syntastic_mode_map = { 'mode': 'active', +" \ 'active_filetypes': ['python', 'javascript', 'css', 'coffee', 'go', 'html', 'rst', 'sass', 'yaml'], +" \ 'passive_filetypes': ['make'] } + +let g:syntastic_python_checker = 'flake8' +let g:syntastic_python_checker_args='--ignore=E125,E127' +let g:syntastic_javascript_checker = 'jshint' + " function! CustomCodeAssistInsertMode() " call RopeCodeAssistInsertMode() " if pumvisible() @@ -497,6 +602,25 @@ let ropevim_extended_complete=1 " " inoremap TabWrapperComplete() + +" vim-makegreen && vim-nosecompiler +" unit testing python code in during editing +" I use files in the same dir test_xxxx.* +" if we're already on the test_xxx.py file, just rerun current test file +" function MakeArgs() +" if empty(matchstr(expand('%'), 'test_')) +" " if no test_ on the filename, then add it to run tests +" let make_args = 'test_%' +" else +" let make_args = '%' +" endif +" +" :call MakeGreen(make_args) +" endfunction +" +" autocmd FileType python map t :call MakeArgs() + +" " ================================================== " Custom Functions " ================================================== @@ -533,3 +657,17 @@ function! JavaScriptFold() endfunction setl foldtext=FoldText() endfunction + +" Clean all end of line extra whitespace with ,S +" Credit: voyeg3r https://github.com/mitechie/pyvim/issues/#issue/1 +" deletes excess space but maintains the list of jumps unchanged +" for more details see: h keepjumps +fun! CleanExtraSpaces() + let save_cursor = getpos(".") + let old_query = getreg('/') + :%s/\s\+$//e + call setpos('.', save_cursor) + call setreg('/', old_query) +endfun +map S :keepjumps call CleanExtraSpaces() + diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..8cb5c30 --- /dev/null +++ b/README.rst @@ -0,0 +1,18 @@ +Rick's Python Config +===================== + +I'm a Python web dev so lots of tweaks for that. + +I've recently done some heavy lifting to get it pathogen compatible so give me a +bit to settle the dust while I finish cleaning/updating docs/testing things +out. + +Install +-------- +Setup is handled by `install.py` which will do the symlinks, install the +plugins, and copy them over to the `.vim/bundle` directory. + +ToDo +---- +- need an upgrade script command to walk through the plugins and pull updates + diff --git a/bundle/Gist.vim.git b/bundle/Gist.vim.git new file mode 160000 index 0000000..ae0ca2e --- /dev/null +++ b/bundle/Gist.vim.git @@ -0,0 +1 @@ +Subproject commit ae0ca2e5ac328b0903da94727b9d60b6b1a99b9e diff --git a/bundle/LustyJuggler.git b/bundle/LustyJuggler.git new file mode 160000 index 0000000..8aea87d --- /dev/null +++ b/bundle/LustyJuggler.git @@ -0,0 +1 @@ +Subproject commit 8aea87dab15bb13b418ac89fe8fdfbc768d727fb diff --git a/bundle/csslint.vim.git b/bundle/csslint.vim.git new file mode 160000 index 0000000..fd2cb30 --- /dev/null +++ b/bundle/csslint.vim.git @@ -0,0 +1 @@ +Subproject commit fd2cb3097d8be44b41401c61be697413548c4269 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim new file mode 160000 index 0000000..287b9c1 --- /dev/null +++ b/bundle/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit 287b9c12aad2420269576504d1c05d36111a4562 diff --git a/bundle/govim.git b/bundle/govim.git new file mode 160000 index 0000000..3c158a0 --- /dev/null +++ b/bundle/govim.git @@ -0,0 +1 @@ +Subproject commit 3c158a06de663a15a5c841e462ab3eea8456e1c3 diff --git a/bundle/jpythonfold.vim.git b/bundle/jpythonfold.vim.git new file mode 160000 index 0000000..d816326 --- /dev/null +++ b/bundle/jpythonfold.vim.git @@ -0,0 +1 @@ +Subproject commit d816326ed3a038340a017647d8dffef826001702 diff --git a/bundle/jshint.vim.git b/bundle/jshint.vim.git new file mode 160000 index 0000000..a3f2fbb --- /dev/null +++ b/bundle/jshint.vim.git @@ -0,0 +1 @@ +Subproject commit a3f2fbb63ee52f191f01be5f7542c404a45d1123 diff --git a/bundle/mako.vim.git b/bundle/mako.vim.git new file mode 160000 index 0000000..603bf2d --- /dev/null +++ b/bundle/mako.vim.git @@ -0,0 +1 @@ +Subproject commit 603bf2dd47a9a53a218660308d7df16598c667f4 diff --git a/bundle/nerdtree.git b/bundle/nerdtree.git new file mode 160000 index 0000000..6697bb7 --- /dev/null +++ b/bundle/nerdtree.git @@ -0,0 +1 @@ +Subproject commit 6697bb7bede42dd180dbb2b62c04cf86aeab1e2e diff --git a/bundle/nginx.vim.git b/bundle/nginx.vim.git new file mode 160000 index 0000000..152bbb2 --- /dev/null +++ b/bundle/nginx.vim.git @@ -0,0 +1 @@ +Subproject commit 152bbb2dc00c2df37049ccf75f68f294208c72cb diff --git a/bundle/pep8--Driessen.git b/bundle/pep8--Driessen.git new file mode 160000 index 0000000..da3f264 --- /dev/null +++ b/bundle/pep8--Driessen.git @@ -0,0 +1 @@ +Subproject commit da3f2649860f66eae2737794f865e0dd07d55a92 diff --git a/bundle/pydoc.vim.git b/bundle/pydoc.vim.git new file mode 160000 index 0000000..3502c81 --- /dev/null +++ b/bundle/pydoc.vim.git @@ -0,0 +1 @@ +Subproject commit 3502c81c3258952cf5f9f791b81f8c2e6b834aa5 diff --git a/bundle/snipmate.vim.git b/bundle/snipmate.vim.git new file mode 160000 index 0000000..f5a75d0 --- /dev/null +++ b/bundle/snipmate.vim.git @@ -0,0 +1 @@ +Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b diff --git a/bundle/surround.vim.git b/bundle/surround.vim.git new file mode 160000 index 0000000..ea46fd0 --- /dev/null +++ b/bundle/surround.vim.git @@ -0,0 +1 @@ +Subproject commit ea46fd04abbb59c4d1c17145c7e90adb8d3702b4 diff --git a/bundle/syntastic.git b/bundle/syntastic.git new file mode 160000 index 0000000..d8386c1 --- /dev/null +++ b/bundle/syntastic.git @@ -0,0 +1 @@ +Subproject commit d8386c1211d7aa5651cf90202e66a5f22ce18c72 diff --git a/bundle/tagbar b/bundle/tagbar new file mode 160000 index 0000000..24915db --- /dev/null +++ b/bundle/tagbar @@ -0,0 +1 @@ +Subproject commit 24915dbe24098d864ef77eba93ca81264268ffc8 diff --git a/bundle/tcomment_vim.git b/bundle/tcomment_vim.git new file mode 160000 index 0000000..16a9e4c --- /dev/null +++ b/bundle/tcomment_vim.git @@ -0,0 +1 @@ +Subproject commit 16a9e4c843748bddaae41ec04614efdd29abe6fa diff --git a/bundle/tlib_vim.git b/bundle/tlib_vim.git new file mode 160000 index 0000000..53435ee --- /dev/null +++ b/bundle/tlib_vim.git @@ -0,0 +1 @@ +Subproject commit 53435eef9eb944184e021aa382a8ec85d59dfc94 diff --git a/bundle/tslime.vim.git b/bundle/tslime.vim.git new file mode 160000 index 0000000..0667ffc --- /dev/null +++ b/bundle/tslime.vim.git @@ -0,0 +1 @@ +Subproject commit 0667ffcb2e069568a86de22f6d0275d8b4604a7a diff --git a/bundle/vim-css-color.git b/bundle/vim-css-color.git new file mode 160000 index 0000000..9802f41 --- /dev/null +++ b/bundle/vim-css-color.git @@ -0,0 +1 @@ +Subproject commit 9802f419b8e5b62c49b1c3b75d171cf1451ab666 diff --git a/bundle/vim-darkdevel.git b/bundle/vim-darkdevel.git new file mode 160000 index 0000000..ac039ef --- /dev/null +++ b/bundle/vim-darkdevel.git @@ -0,0 +1 @@ +Subproject commit ac039ef11c734af61e3f83b77bc819838e8bf1f7 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive new file mode 160000 index 0000000..54ead5a --- /dev/null +++ b/bundle/vim-fugitive @@ -0,0 +1 @@ +Subproject commit 54ead5abcbfdd776e1160b5510a129884c39f29c diff --git a/bundle/vim-javascript.git b/bundle/vim-javascript.git new file mode 160000 index 0000000..22475fc --- /dev/null +++ b/bundle/vim-javascript.git @@ -0,0 +1 @@ +Subproject commit 22475fcbc630d8048885fbe2badbcbefb235f8d1 diff --git a/bundle/vim-less b/bundle/vim-less new file mode 160000 index 0000000..8443f89 --- /dev/null +++ b/bundle/vim-less @@ -0,0 +1 @@ +Subproject commit 8443f89070cedf35481fd8b841ee5ba38cf80984 diff --git a/bundle/vim-markdown.git b/bundle/vim-markdown.git new file mode 160000 index 0000000..10073c3 --- /dev/null +++ b/bundle/vim-markdown.git @@ -0,0 +1 @@ +Subproject commit 10073c3a3c363c34681c2e37ae29e9675e2cde90 diff --git a/bundle/vim-powerline b/bundle/vim-powerline new file mode 160000 index 0000000..09c0cea --- /dev/null +++ b/bundle/vim-powerline @@ -0,0 +1 @@ +Subproject commit 09c0cea859a2e0989eea740655b35976d951a84e diff --git a/bundle/vim-smartinput.git b/bundle/vim-smartinput.git new file mode 160000 index 0000000..78ab4b3 --- /dev/null +++ b/bundle/vim-smartinput.git @@ -0,0 +1 @@ +Subproject commit 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 diff --git a/bundle/vim-supertab.git b/bundle/vim-supertab.git new file mode 160000 index 0000000..096be34 --- /dev/null +++ b/bundle/vim-supertab.git @@ -0,0 +1 @@ +Subproject commit 096be343f89c63fc086a55262f2f264d0d0524b0 diff --git a/bundle/vim-yui3.git b/bundle/vim-yui3.git new file mode 160000 index 0000000..37232e3 --- /dev/null +++ b/bundle/vim-yui3.git @@ -0,0 +1 @@ +Subproject commit 37232e39d73ad8bf0567f171463a8068dc0a2755 diff --git a/bundle/xmledit.git b/bundle/xmledit.git new file mode 160000 index 0000000..e575574 --- /dev/null +++ b/bundle/xmledit.git @@ -0,0 +1 @@ +Subproject commit e575574418a3c1cccc3a516dd0fee7f0717dadb5 diff --git a/bundle_list b/bundle_list index a1fca5a..21e9af3 100644 --- a/bundle_list +++ b/bundle_list @@ -1,13 +1,35 @@ http://github.com/sukima/xmledit.git http://github.com/vim-scripts/mako.vim.git http://github.com/vim-scripts/LustyJuggler.git -http://github.com/vim-scripts/tComment.git +http://github.com/tomtom/tcomment_vim.git http://github.com/vim-scripts/pep8--Driessen.git http://github.com/vim-scripts/jpythonfold.vim.git http://github.com/vim-scripts/pydoc.vim.git http://github.com/tsaleh/vim-supertab.git http://github.com/msanders/snipmate.vim.git http://github.com/vim-scripts/surround.vim.git -http://github.com/kevinw/pyflakes-vim.git http://github.com/vim-scripts/Gist.vim.git http://github.com/scrooloose/nerdtree.git +#http://github.com/vim-scripts/pylint.vim.git +http://github.com/vim-scripts/nginx.vim.git +#git://github.com/mitechie/pyflakes-pathogen.git +#http://github.com/kevinw/pyflakes-vim.git +#https://github.com/nvie/vim-flake8.git +http://github.com/tomtom/tlib_vim.git +https://github.com/ap/vim-css-color.git +git://github.com/majutsushi/tagbar +https://github.com/bolasblack/csslint.vim.git +https://github.com/pangloss/vim-javascript.git +https://github.com/yui/vim-yui3.git +https://github.com/Lokaltog/vim-powerline +http://github.com/depuracao/vim-darkdevel.git +https://github.com/vim-scripts/jshint.vim.git +https://github.com/kien/ctrlp.vim +https://github.com/tpope/vim-fugitive +https://github.com/evhan/tslime.vim.git +https://github.com/kana/vim-smartinput.git +https://github.com/mitechie/govim.git +https://github.com/hallison/vim-markdown.git +https://github.com/scrooloose/syntastic.git +https://github.com/groenewege/vim-less +https://github.com/nono/vim-handlebars.git diff --git a/custom_snippets/_-custom.snippets b/custom_snippets/_-custom.snippets new file mode 100644 index 0000000..8276fce --- /dev/null +++ b/custom_snippets/_-custom.snippets @@ -0,0 +1,17 @@ +snippet merge + = Summary = + + + == Pre Implementation == + + + == Implementation Notes == + + + == Tests == + + + == Lint == + + + == LoC Qualification == diff --git a/custom_snippets/html-custom.snippets b/custom_snippets/html-custom.snippets new file mode 100644 index 0000000..f562c95 --- /dev/null +++ b/custom_snippets/html-custom.snippets @@ -0,0 +1,63 @@ +snippet yuib + + + ${4:text} + + + +snippet wpcode + [codeblock lang="${1:lang}"] + ${2:code} + [/codeblock] + +snippet a + ${3:text} + +snippet lpjstest + + + + + + Test ${LIBRARY} + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
  • lp.${LIBRARY}.test
    • +
+ + diff --git a/custom_snippets/javascript-custom.snippets b/custom_snippets/javascript-custom.snippets new file mode 100644 index 0000000..44d16d1 --- /dev/null +++ b/custom_snippets/javascript-custom.snippets @@ -0,0 +1,108 @@ +# dump out to console +snippet dmp + console.log(${1|somevar}); + +snippet deb + debugger; + +snippet g + get('${1|prop}') + +snippet doc + /** + * ${1|some_doc} + * + */ + +snippet jslint + /*jslint eqeqeq: false, browser: true, debug: true, onevar: true, plusplus: false, newcap: false */ + /*global $: false, window: false, self: false, escape: false, mor: false, sprintf: false */ + +snippet clos + (function () { + ${1|code} + }()); + +snippet setup + setUp: function () { + + }, + + tearDown: function () { + + }, + +snippet test + test_${1|name}: function () { + ${2|code} + } + +snippet true + Y.Assert.isTrue(${1|cond}, "${2|text}"); + +snippet false + Y.Assert.isFalse(${1|cond}, "${2|text}"); + +snippet eq + Y.Assert.areEqual(${1|cond1}, ${2|cond2}, "${3|text}"); + +snippet neq + Y.Assert.areNotEqual(${1|cond1}, ${2|cond2}, "${3|text}"); + +snippet lpjstest + /* Copyright (c) 2012, Canonical Ltd. All rights reserved. */ + + YUI.add('lp.${LIBRARY}.test', function (Y) { + + var tests = Y.namespace('lp.${LIBRARY}.test'); + tests.suite = new Y.Test.Suite('${LIBRARY} Tests'); + + tests.suite.add(new Y.Test.Case({ + name: '${LIBRARY}_tests', + + setUp: function () {}, + tearDown: function () {}, + + test_library_exists: function () { + Y.Assert.isObject(Y.lp.${LIBRARY}, + "We should be able to locate the lp.${LIBRARY} module"); + } + + })); + + }, '0.1', {'requires': ['test', 'console', 'lp.${LIBRARY}']}); + +snippet doc_attr + /** + * @attribute ${1|name} + * @default ${2|default} + * @type ${3|type} + * + */ + +snippet doc_method + /** + * ${1|description} + * + * @method ${2|name} + * @param {${3|type}} ${4|description} + * + */ + +snippet doc_class + /** + * ${1|description} + * + * @class ${2|name} + * @extends ${3|extends} + * + */ + +snippet doc_module + /** + * ${1|description} + * + * @namespace ${2|name} + * @module ${3|module} + * + */ diff --git a/custom_snippets/mail-custom.snippets b/custom_snippets/mail-custom.snippets new file mode 100644 index 0000000..861b372 --- /dev/null +++ b/custom_snippets/mail-custom.snippets @@ -0,0 +1,66 @@ +snippet translations + Hello ${1|user}, + + You have translation templates awaiting review on + https://translations.launchpad.net/${2|project}/${3|series}/+imports + + Are you aware that you can review these yourself? This is a recent + change in Launchpad. + + The process is described here: + https://help.launchpad.net/Translations/YourProject/ImportingTemplates#Manual_review + + (That's just one section of the page; you'll find more useful + information on the rest of the page as well). + + I'll mark your entries as "Needs Information" so that the next person to + look at this won't mail you about them again. The entries were + originally marked "Needs Review," but you can approve them either way. + + + Hope this helps! + + Rick Harding + Launchpad development team + +snippet bmarkuser + Welcome to Bookie on https://bmark.us + + Account details: + username: ${1|username} + password: ${2|password} + api key: ${3|api} + api url: https://bmark.us/${4|username} + + We also encourage you to sign up for our mailing list at: + https://groups.google.com/forum/#!forum/bookie_bookmarks + + and our Twitter account: + http://twitter.com/BookieBmarks + + We post weekly updates and encourage discussion of feature ideas via those + channels. + + All calls to the site are over https. Please don't share your api key with + anyone. It's used to verify you're you via the Chrome plugin and other + automated calls. + + The database is based up twice a day and copied to S3 in case of disaster + or my own stupidity. + + The readable parsing of your bookmarks takes place via a cron job at 4am + very morning. If you've recently imported you should see the readable + content (if available) the next morning. + + We currently support importing from Google Bookmarks and Delicious exports. + Importing from a Chrome or Firefox export does work, however it reads the + folder names in as tags. So be aware of that. + + Documentation on getting started is at: + http://docs.bmark.us + + The Chrome latest development Chrome extension is at: + http://docs.bmark.us/bookie_chrome.crx + + If you have any issues feel free to join #bookie on freenode.net or report + the issue or idea on http://github.com/mitechie/Bookie/issues. diff --git a/custom_snippets/python-custom.snippets b/custom_snippets/python-custom.snippets new file mode 100644 index 0000000..8821228 --- /dev/null +++ b/custom_snippets/python-custom.snippets @@ -0,0 +1,49 @@ +# dump out via log.debug +snippet dmp + log.debug(${1|somevar}) + +snippet testfile + """${1|Dockblock}""" + from unittest import TestCase + + class Test${2|class}(TestCase): + """${3|TestGroup}""" + + def setUp(self): + """Setup Tests""" + pass + + def tearDown(self): + """Tear down each test""" + pass + +snippet testclass + class Test${1|class}(TestCase): + """${2|TestGroup}""" + + def setUp(self): + """Setup Tests""" + pass + + def tearDown(self): + """Tear down each test""" + pass + + +snippet test + def test_${1|method}(self): + """${2|description}""" + + assert ${3|Something}, "${4|Output}" + +snippet ass + assert ${1|condition}, "${2|explanation}" + +snippet pdb + import pdb; pdb.set_trace() + +snippet ipdb + import ipdb; ipdb.set_trace() + +snippet gu + getUtility(I${1|interface}) diff --git a/custom_snippets/rst-custom.snippets b/custom_snippets/rst-custom.snippets new file mode 100644 index 0000000..ec90cff --- /dev/null +++ b/custom_snippets/rst-custom.snippets @@ -0,0 +1,18 @@ +snippet slide + ${1|title} + =================================== + + ${2|content} + + .. raw:: pdf + + Transition Dissolve 1 + PageBreak + + +snippet image + .. image:: {1|image} + :height: {2|height}px + :width: {3|height}px + :alt: {4|alt} + :align: center diff --git a/install.py b/install.py index bbedda1..74d379b 100755 --- a/install.py +++ b/install.py @@ -6,13 +6,14 @@ import subprocess # command to run: -# ln -s /home/rharding/configs/pyvim/vimrc ~/.vimrc -# ln -s /home/rharding/configs/pyvim/vim ~/.vim +# ln -s /home/rharding/configs/vim/vimrc ~/.vimrc +# ln -s /home/rharding/configs/vim/vim ~/.vim CONFIG_FILES = ['.vimrc', '.vim'] HOME_PATH = os.path.expanduser('~') + def removefile(filename): removing_link = "%s/%s" % (HOME_PATH, filename) ret = subprocess.call(["rm", "-rf", removing_link]) @@ -31,10 +32,12 @@ def linkfile(filename): link_location) return + def empty_bundles(): """Need to clear out the bundles to make this reusable""" subprocess.call('rm -rf bundle/*', shell=True) + def remove_bundles(): """Remove the bundle dir from the .vim dir""" subprocess.call('rm -rf $HOME/.vim/bundle', shell=True) @@ -43,11 +46,12 @@ def remove_bundles(): def install_bundles(): """Read bundles file and git clone each repo into .vim/bundle""" bundle_list = open('bundle_list') - git_cmd = '/usr/bin/git clone {0} $HOME/configs/pyvim/bundle/{1}' + git_cmd = '/usr/bin/git clone {0} $HOME/configs/vim/bundle/{1}' for b in bundle_list: - dirname_idx = b.rfind('/') + 1 - dirname = b[dirname_idx:].strip() - subprocess.call(git_cmd.format(b.strip(), dirname), shell=True) + if not b.startswith('#'): + dirname_idx = b.rfind('/') + 1 + dirname = b[dirname_idx:].strip() + subprocess.call(git_cmd.format(b.strip(), dirname), shell=True) # and finally link to the .vim/bundle dir link_location = "%s/%s" % (HOME_PATH, '.vim/bundle') @@ -58,8 +62,9 @@ def install_bundles(): is_located, link_location) return + def fix_xmledit(): - """In order to have xmledit in html you need to link the file to html.vim""" + """In order xmledit in html you need to link the file to html.vim""" xmledit_path = "$HOME/.vim/bundle/xmledit.git/ftplugin" xml = os.path.join(xmledit_path, 'xml.vim') html = os.path.join(xmledit_path, 'html.vim') @@ -71,6 +76,17 @@ def fix_xmledit(): subprocess.call('ln -s {0} {1}'.format(xml, html), shell=True) subprocess.call('ln -s {0} {1}'.format(xml, mako), shell=True) + +def copy_custom_snippets(): + """We need to add our custom snippets after the plugin is downloaded/setup + + """ + import glob, shutil, os + copy_to = os.path.expanduser('~/.vim/bundle/snipmate.vim.git/snippets') + for file in glob.glob("custom_snippets/*.snippets"): + shutil.copy(file, copy_to) + + for conf_file in CONFIG_FILES: removefile(conf_file) linkfile(conf_file) @@ -79,4 +95,4 @@ def fix_xmledit(): remove_bundles() install_bundles() fix_xmledit() - +copy_custom_snippets()