diff options
Diffstat (limited to '.vim')
| -rw-r--r-- | .vim/autocmd.vim | 22 | ||||
| m--------- | .vim/bundle/Vundle.vim | 0 | ||||
| m--------- | .vim/bundle/Vundle.vim.git | 0 | ||||
| -rw-r--r-- | .vim/bundles.vim | 38 | ||||
| -rw-r--r-- | .vim/colors/xoria256.vim | 142 |
5 files changed, 202 insertions, 0 deletions
diff --git a/.vim/autocmd.vim b/.vim/autocmd.vim new file mode 100644 index 0000000..cbba932 --- /dev/null +++ b/.vim/autocmd.vim @@ -0,0 +1,22 @@ +" Indentation rules for different languages. + +" Some rules regarding indentation on different languages. +autocmd FileType sh setlocal shiftwidth=4 tabstop=4 +autocmd FileType perl setlocal shiftwidth=4 tabstop=4 +autocmd FileType c setlocal noexpandtab shiftwidth=4 tabstop=4 +autocmd FileType yacc setlocal shiftwidth=4 tabstop=4 +autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 +autocmd FileType ruby setlocal shiftwidth=2 tabstop=2 +autocmd FileType cpp setlocal noexpandtab shiftwidth=4 tabstop=4 +autocmd FileType php setlocal noexpandtab shiftwidth=4 tabstop=4 +autocmd FileType javascript setlocal shiftwidth=2 tabstop=2 + +" Clean up trailing whitespaces on save. +autocmd BufWritePre * :%s/\s\+$//e +au BufRead,BufNewFile Vagrantfile set filetype=ruby + +" If there is a .lvimrc, source it. Note that this works best by calling vim on +" the root of your project. +if filereadable(".lvimrc") + so .lvimrc +endif diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim new file mode 160000 +Subproject b255382d6242d7ea3877bf059d2934125e0c4d9 diff --git a/.vim/bundle/Vundle.vim.git b/.vim/bundle/Vundle.vim.git new file mode 160000 +Subproject b255382d6242d7ea3877bf059d2934125e0c4d9 diff --git a/.vim/bundles.vim b/.vim/bundles.vim new file mode 100644 index 0000000..8d012ac --- /dev/null +++ b/.vim/bundles.vim @@ -0,0 +1,38 @@ +" Vundle setup +set rtp+=~/.vim/bundle/Vundle.vim.git +call vundle#begin() + +Plugin 'gmarik/Vundle.vim' + +" My list of plugins. +Plugin 'tpope/vim-surround.git' +Plugin 'kien/ctrlp.vim.git' +Plugin 'derekwyatt/vim-scala.git' +Plugin 'fatih/vim-go' +Plugin 'Glench/Vim-Jinja2-Syntax' +Plugin 'saltstack/salt-vim' +Plugin 'b4b4r07/vim-hcl' +Plugin 'fatih/vim-hclfmt' + +call vundle#end() + +"" +" Some small adjustments for the installed plugins. + +" vim-surround.vim: <leader>s is used to surround a word. +map <leader>s ysiw + +" Let CtrlP's window to be taller than its default configuration. +let g:ctrlp_match_window = 'max:40' + +" Hi-yo Silver! +let g:ctrlp_user_command = 'ag %s -l --nocolor --hidden -g ""' + +" Tell vim-go to use goimports on save. +let g:go_fmt_command = "goimports" + +" Execute go-lint on save. +if isdirectory($GOPATH."/src/github.com/golang/lint/misc/vim") + set rtp+=$GOPATH/src/github.com/golang/lint/misc/vim + autocmd BufWritePost,FileWritePost *.go execute 'Lint' | cwindow +endif diff --git a/.vim/colors/xoria256.vim b/.vim/colors/xoria256.vim new file mode 100644 index 0000000..7d1010b --- /dev/null +++ b/.vim/colors/xoria256.vim @@ -0,0 +1,142 @@ +" Vim color file +" +" Name: xoria256.vim +" Version: 1.5 +" Maintainer: Dmitriy Y. Zotikov (xio) <xio@ungrund.org> +" +" Should work in recent 256 color terminals. 88-color terms like urxvt are +" NOT supported. +" +" Don't forget to install 'ncurses-term' and set TERM to xterm-256color or +" similar value. +" +" Color numbers (0-255) see: +" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html +" +" For a specific filetype highlighting rules issue :syntax list when a file of +" that type is opened. + +" Initialization {{{ +if &t_Co != 256 && ! has("gui_running") + echomsg "" + echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)" + echomsg "" + finish +endif + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "xoria256" +"}}} +" Colours {{{1 +"" General {{{2 +hi Normal ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none +hi Cursor ctermbg=214 guibg=#ffaf00 +hi CursorColumn ctermbg=238 guibg=#444444 +hi CursorLine ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi Error ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 +hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000 +hi FoldColumn ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi Folded ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi IncSearch ctermfg=0 guifg=#000000 ctermbg=223 guibg=#ffdfaf cterm=none gui=none +hi LineNr ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 +hi MatchParen ctermfg=188 guifg=#dfdfdf ctermbg=68 guibg=#5f87df cterm=bold gui=bold +" TODO +" hi MoreMsg +hi NonText ctermfg=247 guifg=#9e9e9e ctermbg=233 guibg=#121212 cterm=bold gui=bold +hi Pmenu ctermfg=0 guifg=#000000 ctermbg=250 guibg=#bcbcbc +hi PmenuSel ctermfg=255 guifg=#eeeeee ctermbg=243 guibg=#767676 +hi PmenuSbar ctermbg=252 guibg=#d0d0d0 +hi PmenuThumb ctermfg=243 guifg=#767676 +hi Search ctermfg=0 guifg=#000000 ctermbg=149 guibg=#afdf5f +hi SignColumn ctermfg=248 guifg=#a8a8a8 +hi SpecialKey ctermfg=77 guifg=#5fdf5f +hi SpellBad ctermfg=160 guifg=fg ctermbg=bg cterm=underline guisp=#df0000 +hi SpellCap ctermfg=189 guifg=#dfdfff ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellRare ctermfg=168 guifg=#df5f87 ctermbg=bg guibg=bg cterm=underline gui=underline +hi SpellLocal ctermfg=98 guifg=#875fdf ctermbg=bg guibg=bg cterm=underline gui=underline +hi StatusLine ctermfg=15 guifg=#ffffff ctermbg=239 guibg=#4e4e4e cterm=bold gui=bold +hi StatusLineNC ctermfg=249 guifg=#b2b2b2 ctermbg=237 guibg=#3a3a3a cterm=none gui=none +hi TabLine ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=none gui=none +hi TabLineFill ctermfg=fg guifg=fg ctermbg=237 guibg=#3a3a3a cterm=none gui=none +" FIXME +hi Title ctermfg=225 guifg=#ffdfff +hi Todo ctermfg=0 guifg=#000000 ctermbg=184 guibg=#dfdf00 +hi Underlined ctermfg=39 guifg=#00afff cterm=underline gui=underline +hi VertSplit ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none +" hi VIsualNOS ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff cterm=none gui=none +" hi Visual ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff +hi Visual ctermfg=255 guifg=#eeeeee ctermbg=96 guibg=#875f87 +" hi Visual ctermfg=255 guifg=#eeeeee ctermbg=24 guibg=#005f87 +hi VisualNOS ctermfg=255 guifg=#eeeeee ctermbg=60 guibg=#5f5f87 +hi WildMenu ctermfg=0 guifg=#000000 ctermbg=150 guibg=#afdf87 cterm=bold gui=bold + +"" Syntax highlighting {{{2 +hi Comment ctermfg=244 guifg=#808080 +hi Constant ctermfg=229 guifg=#ffffaf +hi Identifier ctermfg=182 guifg=#dfafdf cterm=none +hi Ignore ctermfg=238 guifg=#444444 +hi Number ctermfg=180 guifg=#dfaf87 +hi PreProc ctermfg=150 guifg=#afdf87 +hi Special ctermfg=174 guifg=#df8787 +hi Statement ctermfg=110 guifg=#87afdf cterm=none gui=none +hi Type ctermfg=146 guifg=#afafdf cterm=none gui=none + +"" Special {{{2 +""" .diff {{{3 +hi diffAdded ctermfg=150 guifg=#afdf87 +hi diffRemoved ctermfg=174 guifg=#df8787 +""" vimdiff {{{3 +hi diffAdd ctermfg=bg guifg=bg ctermbg=151 guibg=#afdfaf +"hi diffDelete ctermfg=bg guifg=bg ctermbg=186 guibg=#dfdf87 cterm=none gui=none +hi diffDelete ctermfg=bg guifg=bg ctermbg=246 guibg=#949494 cterm=none gui=none +hi diffChange ctermfg=bg guifg=bg ctermbg=181 guibg=#dfafaf +hi diffText ctermfg=bg guifg=bg ctermbg=174 guibg=#df8787 cterm=none gui=none +""" HTML {{{3 +" hi htmlTag ctermfg=146 guifg=#afafdf +" hi htmlEndTag ctermfg=146 guifg=#afafdf +hi htmlTag ctermfg=244 +hi htmlEndTag ctermfg=244 +hi htmlArg ctermfg=182 guifg=#dfafdf +hi htmlValue ctermfg=187 guifg=#dfdfaf +hi htmlTitle ctermfg=254 ctermbg=95 +" hi htmlArg ctermfg=146 +" hi htmlTagName ctermfg=146 +" hi htmlString ctermfg=187 +""" django {{{3 +hi djangoVarBlock ctermfg=180 +hi djangoTagBlock ctermfg=150 +hi djangoStatement ctermfg=146 +hi djangoFilter ctermfg=174 +""" python {{{3 +hi pythonExceptions ctermfg=174 +""" NERDTree {{{3 +hi Directory ctermfg=110 guifg=#87afdf +hi treeCWD ctermfg=180 guifg=#dfaf87 +hi treeClosable ctermfg=174 guifg=#df8787 +hi treeOpenable ctermfg=150 guifg=#afdf87 +hi treePart ctermfg=244 guifg=#808080 +hi treeDirSlash ctermfg=244 guifg=#808080 +hi treeLink ctermfg=182 guifg=#dfafdf + +""" VimDebug {{{3 +" FIXME +" you may want to set SignColumn highlight in your .vimrc +" :help sign +" :help SignColumn + +" hi currentLine term=reverse cterm=reverse gui=reverse +" hi breakPoint term=NONE cterm=NONE gui=NONE +" hi empty term=NONE cterm=NONE gui=NONE + +" sign define currentLine linehl=currentLine +" sign define breakPoint linehl=breakPoint text=>> +" sign define both linehl=currentLine text=>> +" sign define empty linehl=empty + |