diff --git a/.gitignore b/.gitignore index 0e3a4d9..c30c042 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,7 @@ backup/* *.swn *.swo .DS_Store -fonts/* +fonts/ +bundle/* +!bundle/.keep Makefile diff --git a/.gitmodules b/.gitmodules index 4875eb3..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,106 +0,0 @@ -[submodule "bundle/nerdtree"] - path = bundle/nerdtree - url = https://github.com/scrooloose/nerdtree.git -[submodule "bundle/taglist"] - path = bundle/taglist - url = https://github.com/vim-scripts/taglist.vim.git - ignore = dirty -[submodule "bundle/tabular"] - path = bundle/tabular - url = https://github.com/godlygeek/tabular.git -[submodule "bundle/eruby"] - path = bundle/eruby - url = https://github.com/vim-scripts/eruby.vim.git -[submodule "bundle/syntastic"] - path = bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "bundle/fugitive"] - path = bundle/fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/nerdcommenter"] - path = bundle/nerdcommenter - url = https://github.com/scrooloose/nerdcommenter.git -[submodule "bundle/autotag"] - path = bundle/autotag - url = https://github.com/vim-scripts/AutoTag.git -[submodule "bundle/bufexplorer"] - path = bundle/bufexplorer - url = https://github.com/corntrace/bufexplorer.git - ignore = dirty -[submodule "bundle/endwise"] - path = bundle/endwise - url = https://github.com/vim-scripts/endwise.vim.git -[submodule "bundle/kwbdi"] - path = bundle/kwbdi - url = https://github.com/vim-scripts/kwbdi.vim.git -[submodule "bundle/matchit"] - path = bundle/matchit - url = https://github.com/vim-scripts/matchit.zip.git - ignore = dirty -[submodule "bundle/ruby-matchit"] - path = bundle/ruby-matchit - url = https://github.com/vim-scripts/ruby-matchit.git -[submodule "bundle/rails"] - path = bundle/rails - url = https://github.com/tpope/vim-rails.git -[submodule "bundle/ruby-refactorings"] - path = bundle/ruby-refactorings - url = https://github.com/ecomba/vim-ruby-refactoring.git -[submodule "bundle/yankring"] - path = bundle/yankring - url = https://github.com/vim-scripts/YankRing.vim.git - ignore = dirty -[submodule "bundle/autocomplpop"] - path = bundle/autocomplpop - url = https://github.com/vim-scripts/AutoComplPop.git - ignore = dirty -[submodule "bundle/sinatra"] - path = bundle/sinatra - url = https://github.com/hallison/vim-ruby-sinatra.git -[submodule "bundle/snipmate"] - path = bundle/snipmate - url = https://github.com/msanders/snipmate.vim.git - ignore = dirty -[submodule "bundle/tagbar"] - path = bundle/tagbar - url = https://github.com/majutsushi/tagbar -[submodule "bundle/vim-slim"] - path = bundle/vim-slim - url = https://github.com/slim-template/vim-slim.git -[submodule "bundle/vim-rabl"] - path = bundle/vim-rabl - url = https://github.com/yaymukund/vim-rabl.git -[submodule "bundle/emmet"] - path = bundle/emmet - url = https://github.com/mattn/emmet-vim.git -[submodule "bundle/vim-airline"] - path = bundle/vim-airline - url = https://github.com/bling/vim-airline.git -[submodule "bundle/vim-gitgutter"] - path = bundle/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter -[submodule "bundle/ctrlp"] - path = bundle/ctrlp - url = https://github.com/kien/ctrlp.vim - ignore = dirty -[submodule "bundle/vim-scala"] - path = bundle/vim-scala - url = https://github.com/derekwyatt/vim-scala.git -[submodule "bundle/ag"] - path = bundle/ag - url = https://github.com/rking/ag.vim.git -[submodule "fonts"] - path = fonts - url = https://github.com/powerline/fonts.git -[submodule "bundle/vim-bundler"] - path = bundle/vim-bundler - url = https://github.com/tpope/vim-bundler.git -[submodule "bundle/vim-surround"] - path = bundle/vim-surround - url = https://github.com/tpope/vim-surround.git -[submodule "bundle/vim-elixir"] - path = bundle/vim-elixir - url = https://github.com/elixir-lang/vim-elixir.git -[submodule "bundle/splitjoin"] - path = bundle/splitjoin - url = https://github.com/AndrewRadev/splitjoin.vim.git diff --git a/README.md b/README.md index 6eea468..32e6f67 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,88 @@ -Dependencias - - - Pacotes - the_silver_searcher (Ag) - exuberant-ctags - libjson-xs-perl - - Gems - hpricot (rspec) - -Configuração - - - PowerLine - Instalar uma das fontes do endereço: https://github.com/Lokaltog/powerline-fonts/tree/master/UbuntuMono - Para linux: https://powerline.readthedocs.org/en/latest/installation/linux.html#font-installation - -Instalação - - - Executar o script instalar.sh - ```./instalar.sh``` - -Comandos Básicos - - - :Ag [padrão] => Busca por um deterinado padrão no projeto - - :Tabularise /[caracter] => Alinha o texto selecionado pelo caracter informado - - ,nt => Abre/Fecha o NerdTree - - ,jt => Indenta um documento JSON - - ,xt => Indenta um documento XML - - ,b => Abre/fecha o verificador de metodos - - ,be => Abre/fecha o buffer explorer - - ,p => Abre o Buscador inteligente de arquivos - - Ctrl+p => Precionado varias vezes permite escolher qual condeúdo copiado no buffer se deseja colar - - Ctrl+← => Navega para os arquivos do buffer à esquerda - - Ctrl+→ => Navega para os arquivos do buffer à direita - - F12 => Adiciona e remove indicadores de linha, fim de linha, e alterações - - sometext + tab => Adiciona códigos do Snipmate +# Dependencias + + - package + - the_silver_searcher (Ag) + - python with pynvim + + +# Fonts + - PowerLine: - https://github.com/terroo/fonts + +# Installation + +```sh + ./installation/install.sh +``` +# Plugins + +### Themes +- https://github.com/vim-airline/vim-airline +- https://github.com/vim-airline/vim-airline-themes +- https://github.com/dracula/vim +- https://github.com/scrooloose/nerdtree.git +- https://github.com/ryanoasis/vim-devicons +- https://github.com/cj/vim-webdevicons +- https://github.com/vim-scripts/CSApprox + +### Buffer +- https://github.com/corntrace/bufexplorer +- https://github.com/vim-scripts/kwbdi.vim.git + +### Git +- https://github.com/tpope/vim-fugitive +- https://github.com/tpope/vim-rhubarb +- https://github.com/airblade/vim-gitgutter + +### Finding +- https://github.com/rking/ag.vim +- https://github.com/kien/ctrlp.vim + +### Analyzing +- https://github.com/majutsushi/tagbar +- https://github.com/dense-analysis/ale +- https://github.com/Yggdroot/indentLine +- https://github.com/sheerun/vim-polyglot + +### Commenter +- https://github.com/scrooloose/nerdcommenter + +### Documentation Generation +- https://github.com/kkoomen/vim-doge + +### Refactoring +- https://github.com/AndrewRadev/splitjoin.vim +- https://github.com/terryma/vim-multiple-cursors + +### Completion +- https://github.com/Raimondi/delimitMate +- https://github.com/SirVer/ultisnips +- https://github.com/honza/vim-snippets +- https://github.com/Shougo/deoplete.nvim +- https://github.com/roxma/nvim-yarp +- https://github.com/roxma/vim-hug-neovim-rpc + +### Programming Languages + +### HTML +- https://github.com/hail2u/vim-css3-syntax +- https://github.com/gorodinskiy/vim-coloresque +- https://github.com/tpope/vim-haml +- https://github.com/mattn/emmet-vim + + +### Javascript +- https://github.com/jelera/vim-javascript-syntax + + +### Ruby +- https://github.com/tpope/vim-rails +- https://github.com/tpope/vim-rake +- https://github.com/tpope/vim-projectionist +- https://github.com/thoughtbot/vim-rspec +- https://github.com/ecomba/vim-ruby-refactoring +- https://github.com/victormours/ruby-memoize.vim + + +### Scala +- https://github.com/ktvoelker/sbt-vim +- https://github.com/derekwyatt/vim-scala diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim deleted file mode 100644 index 4071992..0000000 --- a/autoload/pathogen.vim +++ /dev/null @@ -1,250 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.0 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc -" prior to `filetype plugin indent on` is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a directory name to invoke -" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path -" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards, -" pathogen#cycle_filetype() is invoked. -function! pathogen#infect(...) abort " {{{1 - let source_path = a:0 ? a:1 : 'bundle' - if source_path =~# '[\\/]' - call pathogen#runtime_prepend_subdirectories(source_path) - else - call pathogen#runtime_append_all_bundles(source_path) - endif - call pathogen#cycle_filetype() -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - helptags `=dir.'/doc'` - endif - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) "{{{1 - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - elseif a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) - else - return a:cmd.' '.pathogen#fnameescape(file) - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set ft=vim ts=8 sw=2 sts=2: diff --git a/bundle/.keep b/bundle/.keep new file mode 100644 index 0000000..e69de29 diff --git a/bundle/ag b/bundle/ag deleted file mode 160000 index 4a0dd6e..0000000 --- a/bundle/ag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a0dd6e190f446e5a016b44fdaa2feafc582918e diff --git a/bundle/autocomplpop b/bundle/autocomplpop deleted file mode 160000 index 0b075cf..0000000 --- a/bundle/autocomplpop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b075cf5e6ef05584ef6377e116e8d0fe1f8f788 diff --git a/bundle/autotag b/bundle/autotag deleted file mode 160000 index ef0a37e..0000000 --- a/bundle/autotag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef0a37e8da77cd6c40d97a8e7a60c33ddc39d6ba diff --git a/bundle/bufexplorer b/bundle/bufexplorer deleted file mode 160000 index d1dc1be..0000000 --- a/bundle/bufexplorer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d1dc1be409da9233b6196c1358ce585b6d89723c diff --git a/bundle/ctrlp b/bundle/ctrlp deleted file mode 160000 index 564176f..0000000 --- a/bundle/ctrlp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981 diff --git a/bundle/emmet b/bundle/emmet deleted file mode 160000 index 4617006..0000000 --- a/bundle/emmet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 461700696ea317722c4a8d92a31a7267cdcc0bfb diff --git a/bundle/endwise b/bundle/endwise deleted file mode 160000 index ee7a9b7..0000000 --- a/bundle/endwise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee7a9b7b02b68dd41c2e3b3965a2c1cbdaea7fe5 diff --git a/bundle/eruby b/bundle/eruby deleted file mode 160000 index 9e5a1d3..0000000 --- a/bundle/eruby +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e5a1d38fb4a46cae632ca384a8e8e945f4cd485 diff --git a/bundle/fugitive b/bundle/fugitive deleted file mode 160000 index d90e912..0000000 --- a/bundle/fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d90e912e46b4a294576dd2187a560e22cbdb306a diff --git a/bundle/kwbdi b/bundle/kwbdi deleted file mode 160000 index 1fd0382..0000000 --- a/bundle/kwbdi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1fd0382dd299b9feb343b7960f6977de402b0929 diff --git a/bundle/matchit b/bundle/matchit deleted file mode 160000 index ced6c40..0000000 --- a/bundle/matchit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ced6c409c9beeb0b4142d21906606bd194411d1d diff --git a/bundle/nerdcommenter b/bundle/nerdcommenter deleted file mode 160000 index 7f5c217..0000000 --- a/bundle/nerdcommenter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f5c217f79b8fce063fec490ab0b2814dd480f08 diff --git a/bundle/nerdtree b/bundle/nerdtree deleted file mode 160000 index 63c5920..0000000 --- a/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63c59208c1f9eef7068a944f5c3033bd1a348b97 diff --git a/bundle/rails b/bundle/rails deleted file mode 160000 index 2b33a3d..0000000 --- a/bundle/rails +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b33a3df78f337ec44874fa9fb2862ab229614ce diff --git a/bundle/ruby-matchit b/bundle/ruby-matchit deleted file mode 160000 index c4d8079..0000000 --- a/bundle/ruby-matchit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4d8079287fc8d804d2a92bcb66964d673666540 diff --git a/bundle/ruby-refactorings b/bundle/ruby-refactorings deleted file mode 160000 index 6447a4d..0000000 --- a/bundle/ruby-refactorings +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6447a4debc3263a0fa99feeab5548edf27ecf045 diff --git a/bundle/sinatra b/bundle/sinatra deleted file mode 160000 index b95547e..0000000 --- a/bundle/sinatra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b95547efa54a5eb21d483ea3de9cfc817fc56170 diff --git a/bundle/snipmate b/bundle/snipmate deleted file mode 160000 index 9d93a22..0000000 --- a/bundle/snipmate +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d93a221daff424a0fd32e52eae3abf4003125cb diff --git a/bundle/splitjoin b/bundle/splitjoin deleted file mode 160000 index 4510fb4..0000000 --- a/bundle/splitjoin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4510fb4840840aadb29ec78194afa0de4876bb06 diff --git a/bundle/syntastic b/bundle/syntastic deleted file mode 160000 index 0336c35..0000000 --- a/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0336c35c0b10b46d85cdd9c3df721f978429e82c diff --git a/bundle/tabular b/bundle/tabular deleted file mode 160000 index 339091a..0000000 --- a/bundle/tabular +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 339091ac4dd1f17e225fe7d57b48aff55f99b23a diff --git a/bundle/tagbar b/bundle/tagbar deleted file mode 160000 index 387bbad..0000000 --- a/bundle/tagbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70 diff --git a/bundle/taglist b/bundle/taglist deleted file mode 160000 index 53041fb..0000000 --- a/bundle/taglist +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 53041fbc45398a9af631a20657e109707a455339 diff --git a/bundle/vim-airline b/bundle/vim-airline deleted file mode 160000 index 3f7222e..0000000 --- a/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f7222e488ee06d16f3dd773a0e570fed42d61bc diff --git a/bundle/vim-bundler b/bundle/vim-bundler deleted file mode 160000 index c4553a9..0000000 --- a/bundle/vim-bundler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4553a999c77e48bf74f43ac3d3503456bbba5a5 diff --git a/bundle/vim-elixir b/bundle/vim-elixir deleted file mode 160000 index 46a6847..0000000 --- a/bundle/vim-elixir +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46a68476fc7b4f454c829d83d21997b82ac66f76 diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter deleted file mode 160000 index 9147174..0000000 --- a/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91471746fe687ee867877508dfd809460dab5698 diff --git a/bundle/vim-rabl b/bundle/vim-rabl deleted file mode 160000 index 7e502e0..0000000 --- a/bundle/vim-rabl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e502e0c8ae360b46005ec9e3bebf164eb87bfb0 diff --git a/bundle/vim-scala b/bundle/vim-scala deleted file mode 160000 index bbdfea4..0000000 --- a/bundle/vim-scala +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bbdfea4b98fdb8866a8a6060ec1294643cfeb413 diff --git a/bundle/vim-slim b/bundle/vim-slim deleted file mode 160000 index 6673e40..0000000 --- a/bundle/vim-slim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6673e404370e6f3d44be342cf03ea8c26ab02c66 diff --git a/bundle/vim-surround b/bundle/vim-surround deleted file mode 160000 index fab8621..0000000 --- a/bundle/vim-surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fab8621670f71637e9960003af28365129b1dfd0 diff --git a/bundle/yankring b/bundle/yankring deleted file mode 160000 index 28854ab..0000000 --- a/bundle/yankring +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 28854abef8fa4ebd3cb219aefcf22566997d8f65 diff --git a/colors/Tomorrow-Night.vim b/colors/Tomorrow-Night.vim deleted file mode 100644 index 878b0f8..0000000 --- a/colors/Tomorrow-Night.vim +++ /dev/null @@ -1,349 +0,0 @@ -" Tomorrow Night - Full Colour and 256 Colour -" http://chriskempson.com -" -" Hex colour conversion functions borrowed from the theme "Desert256"" - -" 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:aqua = "8abeb7" -let s:blue = "81a2be" -let s:purple = "b294bb" -let s:window = "4d5057" - -" Console 256 Colours -if !has("gui_running") - let s:background = "303030" - let s:window = "5e5e5e" - let s:line = "3a3a3a" - let s:selection = "585858" -end - -set background=dark -hi clear -syntax reset - -let g:colors_name = "Tomorrow-Night" - -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - " Returns an approximate grey index for the given grey level - fun grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " Returns the actual grey level represented by the grey index - fun grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif - endfun - - " Returns the palette index for the given grey index - fun grey_colour(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif - endfun - - " Returns an approximate colour index for the given colour level - fun rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " Returns the actual colour level for the given colour index - fun rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif - endfun - - " Returns the palette index for the given R/G/B colour indices - fun rgb_colour(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif - endfun - - " Returns the palette index to approximate the given R/G/B colour levels - fun colour(r, g, b) - " Get the closest grey - let l:gx = grey_number(a:r) - let l:gy = grey_number(a:g) - let l:gz = grey_number(a:b) - - " Get the closest colour - let l:x = rgb_number(a:r) - let l:y = rgb_number(a:g) - let l:z = rgb_number(a:b) - - if l:gx == l:gy && l:gy == l:gz - " There are two possibilities - let l:dgr = grey_level(l:gx) - a:r - let l:dgg = grey_level(l:gy) - a:g - let l:dgb = grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = rgb_level(l:gx) - a:r - let l:dg = rgb_level(l:gy) - a:g - let l:db = rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " Use the grey - return grey_colour(l:gx) - else - " Use the colour - return rgb_colour(l:x, l:y, l:z) - endif - else - " Only one possibility - return rgb_colour(l:x, l:y, l:z) - endif - endfun - - " Returns the palette index to approximate the 'rrggbb' hex string - fun rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 - - return colour(l:r, l:g, l:b) - endfun - - " Sets the highlighting for the given group - fun X(group, fg, bg, attr) - if a:fg != "" - exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) - endif - if a:bg != "" - exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif - endfun - - " Vim Highlighting - call X("Normal", s:foreground, s:background, "") - call X("LineNr", s:selection, "", "") - call X("NonText", s:selection, "", "") - call X("SpecialKey", s:selection, "", "") - call X("Search", s:background, s:yellow, "") - call X("TabLine", s:foreground, s:background, "reverse") - call X("StatusLine", s:window, s:yellow, "reverse") - call X("StatusLineNC", s:window, s:foreground, "reverse") - call X("VertSplit", s:window, s:window, "none") - call X("Visual", "", s:selection, "") - call X("Directory", s:blue, "", "") - call X("ModeMsg", s:green, "", "") - call X("MoreMsg", s:green, "", "") - call X("Question", s:green, "", "") - call X("WarningMsg", s:red, "", "") - call X("MatchParen", "", s:selection, "") - call X("Folded", s:comment, s:background, "") - call X("FoldColumn", "", s:background, "") - if version >= 700 - call X("CursorLine", "", s:line, "none") - call X("CursorColumn", "", s:line, "none") - call X("PMenu", s:foreground, s:selection, "none") - call X("PMenuSel", s:foreground, s:selection, "reverse") - end - if version >= 703 - call X("ColorColumn", "", s:line, "none") - end - - " Standard Highlighting - call X("Comment", s:comment, "", "") - call X("Todo", s:comment, s:background, "") - call X("Title", s:comment, "", "") - call X("Identifier", s:red, "", "none") - call X("Statement", s:foreground, "", "") - call X("Conditional", s:foreground, "", "") - call X("Repeat", s:foreground, "", "") - call X("Structure", s:purple, "", "") - call X("Function", s:blue, "", "") - call X("Constant", s:orange, "", "") - call X("String", s:green, "", "") - call X("Special", s:foreground, "", "") - call X("PreProc", s:purple, "", "") - call X("Operator", s:aqua, "", "none") - call X("Type", s:blue, "", "none") - call X("Define", s:purple, "", "none") - call X("Include", s:blue, "", "") - "call X("Ignore", "666666", "", "") - - " Vim Highlighting - call X("vimCommand", s:red, "", "none") - - " C Highlighting - call X("cType", s:yellow, "", "") - call X("cStorageClass", s:purple, "", "") - call X("cConditional", s:purple, "", "") - call X("cRepeat", s:purple, "", "") - - " PHP Highlighting - call X("phpVarSelector", s:red, "", "") - call X("phpKeyword", s:purple, "", "") - call X("phpRepeat", s:purple, "", "") - call X("phpConditional", s:purple, "", "") - call X("phpStatement", s:purple, "", "") - call X("phpMemberSelector", s:foreground, "", "") - - " Ruby Highlighting - call X("rubySymbol", s:green, "", "") - call X("rubyConstant", s:yellow, "", "") - call X("rubyAttribute", s:blue, "", "") - call X("rubyInclude", s:blue, "", "") - call X("rubyLocalVariableOrMethod", s:orange, "", "") - call X("rubyCurlyBlock", s:orange, "", "") - call X("rubyStringDelimiter", s:green, "", "") - call X("rubyInterpolationDelimiter", s:orange, "", "") - call X("rubyConditional", s:purple, "", "") - call X("rubyRepeat", s:purple, "", "") - - " Python Highlighting - call X("pythonInclude", s:purple, "", "") - call X("pythonStatement", s:purple, "", "") - call X("pythonConditional", s:purple, "", "") - call X("pythonFunction", s:blue, "", "") - - " JavaScript Highlighting - call X("javaScriptBraces", s:foreground, "", "") - call X("javaScriptFunction", s:purple, "", "") - call X("javaScriptConditional", s:purple, "", "") - call X("javaScriptRepeat", s:purple, "", "") - call X("javaScriptNumber", s:orange, "", "") - call X("javaScriptMember", s:orange, "", "") - - " Diff Highlighting - call X("diffAdded", s:green, "", "") - call X("diffRemoved", s:red, "", "") - - " 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 diff --git a/colors/molokai.vim b/colors/molokai.vim deleted file mode 100644 index eb9c47b..0000000 --- a/colors/molokai.vim +++ /dev/null @@ -1,215 +0,0 @@ -" Vim color file -" -" Author: Tomas Restrepo -" -" Note: Based on the monokai theme for textmate -" by Wimer Hazenberg and its darker variant -" by Hamish Stuart Macpherson -" - -hi clear - -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="molokai" - -if exists("g:molokai_original") - let s:molokai_original = g:molokai_original -else - let s:molokai_original = 0 -endif - - -hi Boolean guifg=#AE81FF -hi Character guifg=#E6DB74 -hi Number guifg=#AE81FF -hi String guifg=#E6DB74 -hi Conditional guifg=#F92672 gui=bold -hi Constant guifg=#AE81FF 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 ctermbg=NONE -hi Folded guifg=#465457 guibg=#000000 ctermbg=NONE -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F -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=#66D9EF gui=italic - -hi MatchParen guifg=#000000 guibg=#FD971F gui=bold -hi ModeMsg guifg=#E6DB74 -hi MoreMsg guifg=#E6DB74 -hi Operator guifg=#F92672 - -" 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=#455354 -" 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 -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=#F92672 gui=bold -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 - -if s:molokai_original == 1 - hi Normal guifg=#F8F8F2 guibg=#272822 ctermbg=none - hi Comment guifg=#75715E - hi CursorLine guibg=#3E3D32 - hi CursorColumn guibg=#3E3D32 - hi ColorColumn guibg=#3B3A32 - hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#75715E ctermbg=none - hi SpecialKey guifg=#75715E -else - hi Normal guifg=#F8F8F2 guibg=#1B1D1E ctermbg=none - hi Comment guifg=#465457 - hi CursorLine guibg=#293739 - hi CursorColumn guibg=#293739 - hi ColorColumn guibg=#232526 - hi LineNr guifg=#465457 guibg=#232526 - hi NonText guifg=#465457 ctermbg=none - hi SpecialKey guifg=#465457 -end - -" -" Support for 256-color terminal -" -if &t_Co > 255 - hi Boolean ctermfg=135 - hi Character ctermfg=144 - hi Number ctermfg=135 - hi String ctermfg=144 - hi Conditional ctermfg=161 cterm=bold - hi Constant ctermfg=135 cterm=bold - hi Cursor ctermfg=16 ctermbg=253 - hi Debug ctermfg=225 cterm=bold - hi Define ctermfg=81 - hi Delimiter ctermfg=241 - - hi DiffAdd ctermbg=24 - hi DiffChange ctermfg=181 ctermbg=239 - hi DiffDelete ctermfg=162 ctermbg=53 - hi DiffText ctermbg=102 cterm=bold - - hi Directory ctermfg=118 cterm=bold - hi Error ctermfg=219 ctermbg=89 - hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold - hi Exception ctermfg=118 cterm=bold - hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 - hi Function ctermfg=118 - hi Identifier ctermfg=208 cterm=none - hi Ignore ctermfg=244 ctermbg=232 - hi IncSearch ctermfg=193 ctermbg=16 - - hi Keyword ctermfg=161 cterm=bold - hi Label ctermfg=229 cterm=none - hi Macro ctermfg=193 - hi SpecialKey ctermfg=81 - - hi MatchParen ctermfg=16 ctermbg=208 cterm=bold - hi ModeMsg ctermfg=229 - hi MoreMsg ctermfg=229 - hi Operator ctermfg=161 - - " complete menu - hi Pmenu ctermfg=81 ctermbg=16 - hi PmenuSel ctermbg=244 - hi PmenuSbar ctermbg=232 - hi PmenuThumb ctermfg=81 - - hi PreCondit ctermfg=118 cterm=bold - hi PreProc ctermfg=118 - hi Question ctermfg=81 - hi Repeat ctermfg=161 cterm=bold - hi Search ctermfg=253 ctermbg=66 - - " marks column - hi SignColumn ctermfg=118 ctermbg=235 - hi SpecialChar ctermfg=161 cterm=bold - hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 ctermbg=232 - - hi Statement ctermfg=161 cterm=bold - hi StatusLine ctermfg=238 ctermbg=253 - hi StatusLineNC ctermfg=244 ctermbg=232 - hi StorageClass ctermfg=208 - hi Structure ctermfg=81 - hi Tag ctermfg=161 - hi Title ctermfg=166 - hi Todo ctermfg=231 ctermbg=232 cterm=bold - - hi Typedef ctermfg=81 - hi Type ctermfg=81 cterm=none - hi Underlined ctermfg=244 cterm=underline - - hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 - hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold - hi WildMenu ctermfg=81 ctermbg=16 - - hi Normal ctermfg=252 ctermbg=233 ctermbg=none - hi Comment ctermfg=59 - hi CursorLine ctermbg=234 cterm=none - hi CursorColumn ctermbg=234 - hi ColorColumn ctermbg=234 - hi LineNr ctermfg=250 ctermbg=234 - hi NonText ctermfg=59 ctermbg=none - hi SpecialKey ctermfg=59 -end diff --git a/colors/solarized.vim b/colors/solarized.vim deleted file mode 100644 index ca2adea..0000000 --- a/colors/solarized.vim +++ /dev/null @@ -1,977 +0,0 @@ -" Name: Solarized vim colorscheme -" Author: Ethan Schoonover -" URL: http://ethanschoonover.com/solarized -" (see this url for latest release & screenshots) -" License: OSI approved MIT license (see end of this file) -" -" 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 (w:solarized_style=="dark") -" let w:solarized_style="light" -" colorscheme solarized -" else -" let w: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 - -" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB 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 #585858 45 -07 -07 88 110 117 194 25 46 -" base00 #657b83 11/7 bryellow 241 #626262 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 #e4e4e4 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 #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83 -" 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 w:solarized_termtrans = 0 -else - let w:solarized_termtrans = g:solarized_termtrans -endif -if !exists("g:solarized_degrade") - let w:solarized_degrade = 0 -else - let w:solarized_degrade = g:solarized_degrade -endif -if !exists("g:solarized_bold") - let w:solarized_bold = 1 -else - let w:solarized_bold = g:solarized_bold -endif -if !exists("g:solarized_underline") - let w:solarized_underline = 1 -else - let w:solarized_underline = g:solarized_underline -endif -if !exists("g:solarized_italic") - let w:solarized_italic = 1 -else - let w:solarized_italic = g:solarized_italic -endif -if !exists("g:solarized_termcolors") - let w:solarized_termcolors = 256 -else - let w:solarized_termcolors = g:solarized_termcolors -endif -if !exists("w:solarized_style") && !exists("g:solarized_style") - let w:solarized_style = &background -elseif exists("g:solarized_style") - let w:solarized_style = g:solarized_style -" else we have an existing w:solarized_style -endif -if !exists("g:solarized_contrast") - let w:solarized_contrast = "normal" -else - let w:solarized_contrast = g:solarized_contrast -endif -"}}} -" Colorscheme basic settings"{{{ -" --------------------------------------------------------------------- -if w:solarized_style == "dark" - set background=dark -elseif w:solarized_style == "light" - set background=light -else - let w: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") && w: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 = "#d30102" - 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 = "#121212" - let s:g_base03 = "#121212" - let s:g_base02 = "#1c1c1c" - let s:g_base01 = "#4e4e4e" - let s:g_base00 = "#585858" - let s:g_base0 = "#808080" - let s:g_base1 = "#8a8a8a" - let s:g_base2 = "#e4e4e4" - 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) && w:solarized_termcolors != 16 - let s:c_back = "233" - let s:c_base03 = "233" - let s:c_base02 = "234" - let s:c_base01 = "239" - let s:c_base00 = "240" - let s:c_base0 = "244" - let s:c_base1 = "245" - let s:c_base2 = "254" - 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 || w: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 w: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 w: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 w: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 w:solarized_contrast == "low" - let s:g_back = s:g_base02 -endif -"}}} -" Overrides dependent on user specified values"{{{ -" --------------------------------------------------------------------- -if w:solarized_termtrans == 1 - let s:c_back = "NONE" -endif - -if w:solarized_bold == 1 - let s:b = ",bold" -else - let s:b = "" -endif - -if w:solarized_underline == 1 - let s:u = ",underline" -else - let s:u = "" -endif - -if w: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.s:i." gui=NONE".s:b.s:i." term=NONE".s:b.s:i."'" -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.s:i." gui=NONE".s:u.s:i. - \" term=NONE".s:u.s:i."'" -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".s:i." gui=NONE".s:i." term=NONE".s:i."'" -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 - -" *Special any special symbol -exe "hi Special" . s:fg_red .s:bg_none .s:fmt_none -" 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 -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/colors/xoria256.vim b/colors/xoria256.vim deleted file mode 100644 index e8d7a3e..0000000 --- a/colors/xoria256.vim +++ /dev/null @@ -1,94 +0,0 @@ -" Vim color file -" -" Name: xoria256.vim -" Version: 1.2 -" Maintainer: Dmitriy Y. Zotikov (xio) -" -" Should work in recent 256 color terminals. 88-color terms like urxvt are -" unsupported. -" -" 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 - - - -" Bla-bla ---------------------------------------------------------------------- - -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 = "xoria256" - - - -" The real part ---------------------------------------------------------------- - -"" General colors -hi Normal ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none -hi CursorColumn ctermbg=238 guibg=#444444 -hi Cursor ctermbg=214 guibg=#ffaf00 -hi CursorLine ctermbg=238 guibg=#444444 -hi FoldColumn ctermfg=248 guifg=#a8a8a8 ctermbg=bg guibg=bg -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 NonText ctermfg=248 guifg=#a8a8a8 ctermbg=233 guibg=#101010 cterm=bold gui=bold -hi Pmenu ctermfg=0 guifg=#000000 ctermbg=246 guibg=#949494 -hi PmenuSbar ctermbg=243 guibg=#767676 -hi PmenuSel ctermfg=0 guifg=#000000 ctermbg=243 guibg=#767676 -hi PmenuThumb ctermbg=252 guibg=#d0d0d0 -hi Search ctermfg=0 guifg=#000000 ctermbg=149 guibg=#afdf5f -hi SignColumn ctermfg=248 guifg=#a8a8a8 -hi SpecialKey ctermfg=77 guifg=#5fdf5f -hi StatusLine ctermbg=239 guibg=#4e4e4e cterm=bold gui=bold -hi StatusLineNC ctermbg=237 guibg=#3a3a3a cterm=none gui=none -hi TabLine ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=underline gui=underline -hi TabLineFill ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=underline gui=underline -hi VertSplit ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none -hi Visual ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff -hi VIsualNOS ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff cterm=none gui=none -hi WildMenu ctermfg=0 guifg=#000000 ctermbg=150 guibg=#afdf87 cterm=bold gui=bold - -"" Syntax highlighting -hi Comment ctermfg=244 guifg=#808080 -hi Constant ctermfg=229 guifg=#ffffaf -hi Error ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 -hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 -hi Identifier ctermfg=182 guifg=#dfafdf cterm=none -hi Ignore ctermfg=238 guifg=#444444 -hi LineNr ctermfg=248 guifg=#a8a8a8 ctermbg=233 guibg=#101010 -hi MatchParen ctermfg=188 guifg=#dfdfdf ctermbg=68 guibg=#5f87df cterm=bold gui=bold -hi Number ctermfg=180 guifg=#dfaf87 -hi PreProc ctermfg=150 guifg=#afdf87 -hi Special ctermfg=174 guifg=#df8787 -hi Statement ctermfg=110 guifg=#87afdf cterm=none gui=none -hi Todo ctermfg=0 guifg=#000000 ctermbg=184 guibg=#dfdf00 -hi Type ctermfg=146 guifg=#afafdf cterm=none gui=none -hi Underlined ctermfg=39 guifg=#00afff cterm=underline gui=underline - -"" Special -""" .diff -hi diffAdded ctermfg=150 guifg=#afdf87 -hi diffRemoved ctermfg=174 guifg=#df8787 -""" vimdiff -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 - -" vim: set expandtab tabstop=2 shiftwidth=2 smarttab softtabstop=2: diff --git a/fonts b/fonts deleted file mode 160000 index e80e3eb..0000000 --- a/fonts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e80e3eba9091dac0655a0a77472e10f53e754bb0 diff --git a/instalar.sh b/instalar.sh deleted file mode 100755 index edf1227..0000000 --- a/instalar.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash -# ChickiVim install for linux and macosx -# credits for rabeloo at gmail dot com -# source: https://github.com/rabeloo/belovim/blob/master/install.sh - -function fonts_install() { - - if [ -d ./fonts ]; then - rm -rf ./fonts - fi - - $(git clone https://github.com/powerline/fonts.git) - - # Fork of https://github.com/powerline/fonts - powerline_fonts_dir=$( cd "$( dirname "$0" )" && pwd ) - find_command="find \"$powerline_fonts_dir\" \( -name '*.[o,t]tf' -or -name '*.pcf.gz' \) -type f -print0" - - if [[ `uname` == 'Darwin' ]]; then - font_dir="$HOME/Library/Fonts" - else - font_dir="$HOME/.fonts" - mkdir -p $font_dir - fi - - # Copy all fonts to user fonts directory - eval $find_command | xargs -0 -I % cp "%" "$font_dir/" - - # Reset font cache on Linux - if [[ -n `which fc-cache` ]]; then - fc-cache -f $font_dir - fi - echo -ne "\t+ Powerline fonts installed to $font_dir\n" -} - -function mac_install() { - echo -ne "\t+ Check dependencies...\n" - brew install python ctags the_silver_searcher ncurses - - echo -ne "\t+ Getting powerline fonts...\n" - # Call fonts_install function - fonts_install - - echo -ne "\t+ Installing Plugins...\n" - $(git submodule update --init) - - echo "************* IMPORTANT ************ - - Please change the font of your current profile in iTerm2: - - In iTerm2 go to: - - 1. Preferences > Profile - 2. Select the text tab - 3. Change the Regular and Non-ASCII using fonts for Powerline: - - Suggest: 15pt Inconsolata for Powerline - - Enjoy it! - Thanks! - ***********************************" -} - -function linux_install() { - if [ -f /usr/bin/apt-get ]; then - packager="apt-get" - packs="exuberant-ctags silversearcher-ag ncurses-term libjson-xs-perl vim-gtk" - elif [ -f /usr/bin/yum ]; then - packager="yum" - packs="ctags-etags the_silver_searcher ncurses-term perl-JSON-XS" - else - echo "ERR: Package Manager not indentified. Please install manually." - exit 1 - fi - - echo "Installing pre-requisites..." - for pack in $packs; do - sudo $packager install $pack -y - done - - echo "Configuring VIM..." - if [ ! -d ~/.fonts/ ]; then - mkdir ~/.fonts - if [ ! -f ~/.fonts/PowerlineSymbols.otf ]; then - wget "https://github.com/Lokaltog/powerline/raw/develop/font/PowerlineSymbols.otf" - mv PowerlineSymbols.otf ~/.fonts/ - fi - fi - - if [ ! -d ~/.config/fontconfig/conf.d/ ]; then - mkdir -p ~/.config/fontconfig/conf.d/ - if [ ! -f ~/.config/fontconfig/conf.d/10-powerline-symbols.conf ]; then - wget "https://github.com/Lokaltog/powerline/raw/develop/font/10-powerline-symbols.conf" - mv 10-powerline-symbols.conf ~/.config/fontconfig/conf.d/ - fi - fi - - echo "Installing Plugins..." - git submodule update --init -} - -if [[ $(uname) == 'Darwin' ]]; then - mac_install -else - linux_install -fi - -# Create symbolic link -if [ -e ~/.vimrc ]; then - unlink ~/.vimrc -fi -if [ -e ~/.vim ]; then - unlink ~/.vim -fi - -if [ ! -e ~/.vimrc ]; then - ln -s $(pwd)/vimrc ~/.vimrc -fi -if [ ! -e ~/.vim ]; then - ln -s $(pwd) ~/.vim -fi diff --git a/installation/fonts_install.sh b/installation/fonts_install.sh new file mode 100755 index 0000000..3ef812e --- /dev/null +++ b/installation/fonts_install.sh @@ -0,0 +1,38 @@ +#!/bin/bash +function fonts_install() { + echo -ne "\t+ Getting powerline fonts...\n" + + if [ -d "$CLONED_FONTS" ]; then + rm -rf "$CLONED_FONTS" + fi + + CLONED_FONTS="$INSTALLATION_PATH/fonts/" + $(git clone https://github.com/terroo/fonts.git "$CLONED_FONTS") + + # Fork of https://github.com/terroo/fonts.git) + find_command="find \""$CLONED_FONTS"\" \( -name '*.[o,t]tf' -or -name '*.pcf.gz' \) -type f -print0" + + if [[ `uname` == 'Darwin' ]]; then + font_dir="$HOME/Library/Fonts" + else + font_dir="$HOME/.fonts" + mkdir -p $font_dir + fi + + # Copy all fonts to user fonts directory + eval $find_command | xargs -0 -I % cp "%" "$font_dir/" + + # Reset font cache on Linux + if [[ -n `which fc-cache` ]]; then + fc-cache -f $font_dir + fi + + if [ -d "$CLONED_FONTS" ]; then + rm -rf "$CLONED_FONTS" + fi + + echo -ne "\t+ Powerline fonts installed to $font_dir\n" +} + +# Call fonts_install function +fonts_install diff --git a/installation/install.sh b/installation/install.sh new file mode 100755 index 0000000..9c90ffd --- /dev/null +++ b/installation/install.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# ChickiVim install for linux and macosx +# credits for rabeloo at gmail dot com +# source: https://github.com/rabeloo/belovim/blob/master/install.sh + +VIM_PATH="$HOME/.vim" +INSTALLATION_PATH="$VIM_PATH/installation" + +echo -ne "\t+ Cloning Vundle...\n" +git clone https://github.com/VundleVim/Vundle.vim.git "$VIM_PATH/bundle/Vundle.vim" + +source "$INSTALLATION_PATH/fonts_install.sh" + +if [[ $(uname) == 'Darwin' ]]; then + source "$INSTALLATION_PATH/mac_install.sh" +else + source "$INSTALLATION_PATH/linux_install.sh" +fi + +# Create symbolic link +echo -ne "\t+ Linking vimrc file...\n" +if [ -e "$HOME/.vimrc" ]; then + unlink "$HOME/.vimrc" +fi + +if [ ! -e "$HOME/.vimrc" ]; then + ln -s "$VIM_PATH/vimrc" "$HOME/.vimrc" +fi diff --git a/installation/linux_install.sh b/installation/linux_install.sh new file mode 100644 index 0000000..c4baaf5 --- /dev/null +++ b/installation/linux_install.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +#TODO Recreate in a linux machine +#function linux_install() { + #if [ -f /usr/bin/apt-get ]; then + #packager="apt-get" + #packs="exuberant-ctags silversearcher-ag ncurses-term libjson-xs-perl vim-gtk" + #elif [ -f /usr/bin/yum ]; then + #packager="yum" + #packs="ctags-etags the_silver_searcher ncurses-term perl-JSON-XS" + #else + #echo "ERR: Package Manager not indentified. Please install manually." + #exit 1 + #fi + + #echo "Installing pre-requisites..." + #for pack in $packs; do + #sudo $packager install $pack -y + #done + + #echo "Configuring VIM..." + #if [ ! -d ~/.fonts/ ]; then + #mkdir ~/.fonts + #if [ ! -f ~/.fonts/PowerlineSymbols.otf ]; then + #wget "https://github.com/Lokaltog/powerline/raw/develop/font/PowerlineSymbols.otf" + #mv PowerlineSymbols.otf ~/.fonts/ + #fi + #fi + + #if [ ! -d ~/.config/fontconfig/conf.d/ ]; then + #mkdir -p ~/.config/fontconfig/conf.d/ + #if [ ! -f ~/.config/fontconfig/conf.d/10-powerline-symbols.conf ]; then + #wget "https://github.com/Lokaltog/powerline/raw/develop/font/10-powerline-symbols.conf" + #mv 10-powerline-symbols.conf ~/.config/fontconfig/conf.d/ + #fi + #fi + + #echo "Installing Plugins..." + #git submodule update --init +#} + +#linux_install diff --git a/installation/mac_install.sh b/installation/mac_install.sh new file mode 100644 index 0000000..232ef68 --- /dev/null +++ b/installation/mac_install.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +function mac_install() { + echo -ne "\t+ Check dependencies...\n" + brew install ag python + + echo -ne "\t+ Installing Deoplete dependency" + pip3 install --user --upgrade pynvim + + echo "************* IMPORTANT ************ + + Please change the font of your current profile in iTerm2: + + In iTerm2 go to: + + 1. Preferences > Profile + 2. Select the text tab + 3. Change the Regular and Non-ASCII using fonts for Powerline: + + Suggest: RobotoMono Nerd Font + + Enjoy it! + Thanks! + ***********************************" +} + +mac_install diff --git a/vimrc b/vimrc index d30c15a..fd5f14a 100644 --- a/vimrc +++ b/vimrc @@ -1,55 +1,112 @@ -" do not use vi compatibility mode. must come first because it changes other options. -set nocompatible +set nocompatible " be iMproved, required +filetype off " required + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() +" alternatively, pass a path where Vundle should install plugins +"call vundle#begin('~/some/path/here') + +" let Vundle manage Vundle, required +" Plugins +Plugin 'VundleVim/Vundle.vim' +" Themes +Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' +Plugin 'dracula/vim' +Plugin 'scrooloose/nerdtree.git' +Plugin 'ryanoasis/vim-devicons' +Plugin 'cj/vim-webdevicons' +Plugin 'vim-scripts/CSApprox' +" Buffer +Plugin 'corntrace/bufexplorer' +Plugin 'vim-scripts/kwbdi.vim.git' +" Git +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-rhubarb' " required by fugitive to :Gbrowse +Plugin 'airblade/vim-gitgutter' +" Finding +Plugin 'rking/ag.vim' +Plugin 'kien/ctrlp.vim' +" Analyzing +Plugin 'majutsushi/tagbar' +Plugin 'dense-analysis/ale' +Plugin 'Yggdroot/indentLine' +Plugin 'sheerun/vim-polyglot' +" Commenter +Plugin 'scrooloose/nerdcommenter' +" Documentation Generation +Plugin 'kkoomen/vim-doge' +" Refactoring +Plugin 'AndrewRadev/splitjoin.vim' +Plugin 'terryma/vim-multiple-cursors' " Tutorial: https://www.youtube.com/watch?v=YwMgnmZNWXA +" Completion +Plugin 'Raimondi/delimitMate' +Plugin 'SirVer/ultisnips' +Plugin 'honza/vim-snippets' +if has('nvim') + Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +else + Plugin 'Shougo/deoplete.nvim' + Plugin 'roxma/nvim-yarp' + Plugin 'roxma/vim-hug-neovim-rpc' +endif -" show incomplete commands -set showcmd +" Programming Languages +" html +"" HTML Bundle +Plugin 'hail2u/vim-css3-syntax' +Plugin 'gorodinskiy/vim-coloresque' +Plugin 'tpope/vim-haml' +Plugin 'mattn/emmet-vim' -" show invisibles -set list -" use the same symbols as TextMate for tabstops and EOLs -set listchars=tab:▸\ ,eol:¬ +" javascript +"" Javascript Bundle +Plugin 'jelera/vim-javascript-syntax' -" show line numbers -set number -" don't break wrapped lines on words -set linebreak +" ruby +Plugin 'tpope/vim-rails' +Plugin 'tpope/vim-rake' +Plugin 'tpope/vim-projectionist' +Plugin 'thoughtbot/vim-rspec' +Plugin 'ecomba/vim-ruby-refactoring' +Plugin 'victormours/ruby-memoize.vim' -" set no word rap line -set nowrap -" highlight N columns -set cc=120 +" scala +if has('python') + " sbt-vim + Plugin 'ktvoelker/sbt-vim' +endif +" vim-scala +Plugin 'derekwyatt/vim-scala' -" show highlight columns on cursor -set cursorcolumn +" All of your Plugins must be added before the following line +call vundle#end() " required +filetype plugin indent on " required -" Hablitite vim for receive mouse clicks -set mouse=a +" General Configuration -" Habilite vim yank to clipboard (it doesn't work for mac) -" Works on linux -"set clipboard=unnamedplus -" Works on Mac -set clipboard=unnamed +" Change leader key +let mapleader="," -" enable syntax highlighting -syntax on +" Line numbers +set nu! -call pathogen#infect() -call pathogen#helptags() +" don't break wrapped lines on words +set linebreak -" auto detect the type of file that is being edited -filetype on -" enable file type detection -filetype plugin on -" enable filetype-based indentation -filetype indent on +" set no word rap line +set nowrap -" intuitive backspacing +" Intuitive backspacing set backspace=indent,eol,start +" use the same symbols as TextMate for tabstops and EOLs +set listchars=tab:▸\ ,eol:¬ + " EOL format set fileformats=unix,mac,dos @@ -87,81 +144,32 @@ set backup " turn on backup set backupdir=~/.vim/backup " dir to save backup files set directory=~/.vim/tmp " dir to keep all swap files -" show status line all the time -set laststatus=2 - -" Useful status information at bottom of screen -"set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %{fugitive#statusline()}\ %{exists('g:loaded_rvm')?rvm#statusline():''}\ %=%-16(\ %l,%c-%v\ %)%P -"statusline setup -set statusline=%f " tail of the filename -set statusline+=\ [%{strlen(&fenc)?&fenc:'none'}, " file encoding -set statusline+=\ %{&ff}] " file format -set statusline+=\ %r " Opened type (read-only) -set statusline+=\ %m " Modify? -set statusline+=\ %y " File type (vim, php, ruby) -set statusline+=\ %{fugitive#statusline()} " Git -set statusline+=\ %{exists('g:loaded_rvm')?rvm#statusline():''} " RVM -set statusline+=%= " left/right separator -set statusline+=%c, " cursor column -set statusline+=%l/%L " cursor line/total lines -set statusline+=\ %P " percent through file - -" Warning syntastic -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* - -" Airline -" Fonts -let g:airline_powerline_fonts = 1 -" Buffer line (top) -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#formatter = 'unique_tail_improved' - -" Buffer Navigation -:noremap :bprev -:noremap :bnext - -" enhanced command line completion -set wildmenu -" complete files like a shell -set wildmode=list:longest - -" handle multiple buffers better -set hidden +" Encoding +set encoding=utf8 -" set color scheme -colorscheme molokai - -" enable 256 colors in terminal -set t_Co=256 - -" change leader key -let mapleader="," - -" save keystrokes, so we don't need to press the Shift key -nnoremap ; : - -" switch to last used buffer -nnoremap l :e# - -" YankRing mapping -nnoremap y :YRShow +" keep window on buffer delete +nmap bd Kwbd -" YankRing configs -let g:yankring_history_dir = "~/.vim/tmp" +" Hablitite vim for receive mouse clicks +set mouse=a +" Habilite vim yank to clipboard (it doesn't work for mac) +" Works on linux +"set clipboard=unnamedplus +" Works on Mac +set clipboard=unnamed +" " clears the search register nmap / :nohlsearch -" keep window on buffer delete -nmap bd Kwbd +" JSON Format +map jt :%!ruby -rjson -e "print JSON.pretty_generate(JSON.parse(ARGF.read))"=% -" use tagbar -nmap b :TagbarToggle +" XML Format +map xt :1,$!xmllint --format - -" use sudo to write the file -cmap w!! w !sudo tee % >/dev/null +" Ruby debugger +map rdb orequire 'pry'; binding.pry:w " run the above commands only if vim is compiled with autocmd if has("autocmd") @@ -184,59 +192,71 @@ function! StripTrailingWhitespaces() call cursor(l, c) endfunction -" function to delete all hidden buffers -function! Wipeout() - " list of *all* buffer numbers - let l:buffers = range(1, bufnr('$')) - - " what tab page are we in? - let l:currentTab = tabpagenr() - try - " go through all tab pages - let l:tab = 0 - while l:tab < tabpagenr('$') - let l:tab += 1 - - " go through all windows - let l:win = 0 - while l:win < winnr('$') - let l:win += 1 - " whatever buffer is in this window in this tab, remove it from - " l:buffers list - let l:thisbuf = winbufnr(l:win) - call remove(l:buffers, index(l:buffers, l:thisbuf)) - endwhile - endwhile - - " if there are any buffers left, delete them - if len(l:buffers) - execute 'bwipeout' join(l:buffers) - endif - finally - " go back to our original tab page - execute 'tabnext' l:currentTab - endtry -endfunction +" Plugins Configuration -" mapping for function above -map bw :call Wipeout() +" AirLine +let g:airline_theme='violet' +let g:airline_powerline_fonts = 1 +let g:airline#extensions#ale#enabled = 1 + +" Dracula +syntax on +" Fix broken colorscheme (see https://github.com/dracula/vim/issues/65#issuecomment-377496609) +let g:dracula_italic = 0 +colorscheme dracula +highlight Normal ctermbg=None " NerdTree +let g:NERDTreeChDirMode=2 +let g:NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] +let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] +let g:NERDTreeShowBookmarks=1 +let g:nerdtree_tabs_focus_on_files=1 +let g:NERDTreeMapOpenInTabSilent = '' +let g:NERDTreeWinSize = 50 +set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite +map nf :NERDTreeFind map nt :NERDTreeToggle -" JSON Format -map jt :%!ruby -rjson -e "print JSON.pretty_generate(JSON.parse(ARGF.read))"=% - -" XML Format -map xt :1,$!xmllint --format - - -" Tab next -nnoremap k :tabnew % -nnoremap l :tabprevious -nnoremap h :tabnext +" Bufferexplorer +" switch to last used buffer +nnoremap l :e# +set hidden " Allow Bufer Explorer to change opened files without saving (http://vimcasts.org/transcripts/6/en/) + +" Taggbar +map tb :TagbarToggle + +" Fugitive +map gb :Gblame +map of :Gbrowse +" Open current line on GitHub +nnoremap ol :.Gbrowse +if exists("*fugitive#statusline") + set statusline+=%{fugitive#statusline()} +endif -" Remove file -"nnoremap :!rm % +" ale +let g:ale_linters = {} +let g:ale_list_window_size = 3 +let g:ale_sign_column_always = 1 +let g:ale_open_list = 1 +let g:ale_sign_error = '✗' +let g:ale_sign_warning = '⚠' +nmap (ale_previous_wrap) +nmap (ale_next_wrap) + +" Deoplete +let g:deoplete#enable_at_startup = 1 + +" snippets +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsEditSplit="vertical" + +" kwbdi +" keep window on buffer delete +nmap bd Kwbd " Ctrlp " List all files with a patern @@ -245,33 +265,68 @@ nnoremap p :CtrlP " List all files with a patern in buffer nnoremap P :CtrlPBuffer -" switch to last used buffer -nnoremap l :e# - -" TagList of functions -map T :TlistToggle - -" Enable syntastic syntax checking -let g:syntastic_error_symbol='✗' -let g:syntastic_warning_symbol='⚠' -let g:syntastic_enable_signs=1 -let g:syntastic_check_on_open=1 -let g:syntastic_auto_jump=1 -let g:syntastic_enable_highlighting=1 -" Silencia os Warnings -"let g:syntastic_quiet_messages = {'level': 'warnings'} - -" Defines specific files extensions for highlighting -if has("syntax") - au BufNewFile,BufRead *.jsonify set filetype=ruby - au BufNewFile,BufRead Gemfile set filetype=ruby - au BufNewFile,BufRead *.json set filetype=javascript +"" Include user's local vim config +if filereadable(expand("~/.vimrc.local")) + source ~/.vimrc.local endif -" Ruby debugger -map rdb orequire 'pry'; binding.pry:w +" html +" for html files, 2 spaces +autocmd Filetype html setlocal ts=2 sw=2 expandtab + + +" javascript +let g:javascript_enable_domhtmlcss = 1 + +" vim-javascript +augroup vimrc-javascript + autocmd! + autocmd FileType javascript setl tabstop=4|setl shiftwidth=4|setl expandtab softtabstop=4 +augroup END + + +" ruby +let g:rubycomplete_buffer_loading = 1 +let g:rubycomplete_classes_in_global = 1 +let g:rubycomplete_rails = 1 + +augroup vimrc-ruby + autocmd! + autocmd BufNewFile,BufRead *.rb,*.rbw,*.gemspec setlocal filetype=ruby + autocmd FileType ruby set tabstop=2|set shiftwidth=2|set expandtab softtabstop=2 +augroup END + +let g:tagbar_type_ruby = { + \ 'kinds' : [ + \ 'm:modules', + \ 'c:classes', + \ 'd:describes', + \ 'C:contexts', + \ 'f:methods', + \ 'F:singleton methods' + \ ] +\ } + +" RSpec.vim mappings +map t :call RunCurrentSpecFile() +map s :call RunNearestSpec() +map ls :call RunLastSpec() +map a :call RunAllSpecs() + +" For ruby refactory +if has('nvim') + runtime! macros/matchit.vim +else + packadd! matchit +endif -" Toggle for add and remove line number, end line, and changes indicators -" Good for copy multilines from vim (for example) -imap :set list! \| set nu! \| call gitgutter#toggle() -map :set list! \| set nu! \| call gitgutter#toggle() +" Ruby refactory +nnoremap rap :RAddParameter +nnoremap rcpc :RConvertPostConditional +nnoremap rel :RExtractLet +vnoremap rec :RExtractConstant +vnoremap relv :RExtractLocalVariable +nnoremap rit :RInlineTemp +vnoremap rrlv :RRenameLocalVariable +vnoremap rriv :RRenameInstanceVariable +vnoremap rem :RExtractMethod