vasili/dotvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

airline-themes and vim-polyglot

Browse Source
This commit is contained in:
Vasili Sviridov
2016-02-16 19:19:40 -08:00
parent 3f4549cbe2
commit 3beca80682
1 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
vimrc
View File

@@ -13,7 +13,8 @@ endif
if(have_plug) if(have_plug)
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
Plug 'w0ng/vim-hybrid' " Hybrid colorscheme Plug 'w0ng/vim-hybrid' " Hybrid colorscheme
Plug 'bling/vim-airline' " Status bar Plug 'vim-airline/vim-airline' " Status bar
Plug 'vim-airline/vim-airline-themes' " Status bar themes
Plug 'gregsexton/gitv' " GitK for Fugitive Plug 'gregsexton/gitv' " GitK for Fugitive
Plug 'ivyl/vim-bling' " blink search results Plug 'ivyl/vim-bling' " blink search results
Plug 'ctrlpvim/ctrlp.vim' " Fuzzy search Plug 'ctrlpvim/ctrlp.vim' " Fuzzy search
@@ -24,18 +25,24 @@ if(have_plug)
Plug 'tpope/vim-surround' " Surround with quotes Plug 'tpope/vim-surround' " Surround with quotes
Plug 'rking/ag.vim' " Silver Searcher Support Plug 'rking/ag.vim' " Silver Searcher Support
Plug 'junegunn/rainbow_parentheses.vim' " Color matched parenthesis Plug 'junegunn/rainbow_parentheses.vim' " Color matched parenthesis
Plug 'tpope/vim-commentary' " Commenting
Plug 'unblevable/quick-scope' " f/t navigation helper
" Language " Language
Plug 'dag/vim-fish' " Fish Shell Support Plug 'dag/vim-fish' " Fish Shell Support
Plug 'tpope/vim-rails' " Rails integration Plug 'tpope/vim-rails' " Rails integration
Plug 'mattn/emmet-vim' " ZenCoding Plug 'mattn/emmet-vim' " ZenCoding
" Syntax " Syntax
Plug 'evanmiller/nginx-vim-syntax' " Nginx Syntax
Plug 'scrooloose/syntastic' " Syntax checker Plug 'scrooloose/syntastic' " Syntax checker
Plug 'leshill/vim-json' " JSON support Plug 'sheerun/vim-polyglot' " Language Support Bundle
Plug 'slim-template/vim-slim' " SLIM Markup Syntax " Plug 'evanmiller/nginx-vim-syntax' " Nginx Syntax
Plug 'pangloss/vim-javascript' " Vim Javascript support " Plug 'leshill/vim-json' " JSON support
Plug 'kennethzfeng/vim-raml' " RAML Bindings " Plug 'slim-template/vim-slim' " SLIM Markup Syntax
Plug 'digitaltoad/vim-jade' " JADE bindings " Plug 'pangloss/vim-javascript' " Vim Javascript support
" Plug 'kennethzfeng/vim-raml' " RAML Bindings
" Plug 'digitaltoad/vim-jade' " JADE bindings
" Plug 'mxw/vim-jsx' " JSX
" Plug 'tmux-plugins/vim-tmux' " tmux.conf
call plug#end() call plug#end()
if empty(glob("~/.vim/plugged")) if empty(glob("~/.vim/plugged"))
@@ -106,8 +113,8 @@ if has("autocmd")
au! au!
autocmd FileType javascript set ai sw=2 sts=2 et autocmd FileType javascript set ai sw=2 sts=2 et
autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz
autocmd BufRead *.js let g:syntastic_javascript_checkers = ['jshint', 'flow'] "autocmd BufRead *.js,*.jsx let g:syntastic_javascript_checkers = ['eslint']
"autocmd BufRead *.js let g:syntastic_javascript_flow_args = "--all" map <leader>jj :set ft=javascript.jsx<cr>
augroup END augroup END
augroup ruby augroup ruby
@@ -116,6 +123,17 @@ if has("autocmd")
autocmd BufRead *.rb let g:syntastic_ruby_checkers = ['rubocop', 'mri'] autocmd BufRead *.rb let g:syntastic_ruby_checkers = ['rubocop', 'mri']
autocmd BufRead *.rb let g:syntastic_ruby_rubocop_exec = '/usr/bin/rubocop' autocmd BufRead *.rb let g:syntastic_ruby_rubocop_exec = '/usr/bin/rubocop'
augroup END augroup END
augroup html
au!
au BufNewFile,BufRead *.ejs set filetype=html
autocmd FileType html call SetHtmlOptions()
function! SetHtmlOptions()
if(executable('tidy'))
let g:syntastic_html_tidy_ignore_errors = [ '<meta> proprietary attribute "property"', '<html> proprietary attribute "prefix"', 'trimming empty <span>', 'trimming empty <i>' ]
endif
endfunction
augroup END
endif endif
" Set up CtrlP with faster alternative, if possible " Set up CtrlP with faster alternative, if possible
@@ -132,6 +150,7 @@ nmap <leader>qt :QuickfixsignsToggle<cr>
nmap <leader>qq :QuickfixsignsSet<cr> nmap <leader>qq :QuickfixsignsSet<cr>
nmap <silent><leader>w :up<cr> nmap <silent><leader>w :up<cr>
imap <silent><leader>w <Esc>:up<cr>a imap <silent><leader>w <Esc>:up<cr>a
cmap w!! w !sudo tee % >/dev/null
"Remove search highlight when <Esc> is pressed "Remove search highlight when <Esc> is pressed
nnoremap <silent> <Esc><Esc> <Esc>:nohlsearch<CR><Esc> nnoremap <silent> <Esc><Esc> <Esc>:nohlsearch<CR><Esc>
@@ -179,6 +198,9 @@ nnoremap k gk
imap jk <Esc> imap jk <Esc>
"press space in normal mode to center screen "press space in normal mode to center screen
nmap <space> zz nmap <space> zz
nmap <leader>] :bn<cr>
nmap <leader>[ :bp<cr>
nmap <leader>d :bd<cr>
if has("gui_running") if has("gui_running")
"set guifont=Consolas:h10:cRUSSIAN,Lucida\ Console:h10:cRUSSIAN "set guifont=Consolas:h10:cRUSSIAN,Lucida\ Console:h10:cRUSSIAN
@@ -186,13 +208,11 @@ if has("gui_running")
set guifont=Menlo_for_Powerline:h10:cANSI set guifont=Menlo_for_Powerline:h10:cANSI
endif endif
else else
let g:Powerline_symbols = 'fancy' "Powerline fonts for Airline
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
set mouse=a set mouse=a
endif endif
"Powerline fonts for Airline
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
if exists("g:loaded_syntastic_checker") if exists("g:loaded_syntastic_checker")
@@ -200,11 +220,34 @@ if exists("g:loaded_syntastic_checker")
nmap <leader>e :Errors<cr> nmap <leader>e :Errors<cr>
endif endif
nmap <leader>] :bn<cr> " if exists("g:loaded_quick_scope")
nmap <leader>[ :bp<cr> " Insert into your .vimrc after quick-scope is loaded.
nmap <leader>d :bd<cr> " Obviously depends on <https://github.com/unblevable/quick-scope> being installed.
set wildignore+=*/Deploy/*,*/node_modules/*,*/build/*,*/lib/* " Thanks to @VanLaser for cleaning the code up and expanding capabilities to include e.g. `df`
let g:qs_enable = 0
let g:qs_enable_char_list = [ 'f', 'F', 't', 'T' ]
function! Quick_scope_selective(movement)
let needs_disabling = 0
if !g:qs_enable
QuickScopeToggle
redraw
let needs_disabling = 1
endif
let letter = nr2char(getchar())
if needs_disabling
QuickScopeToggle
endif
return a:movement . letter
endfunction
" quick_scope maps, operator-pending mode included (can do 'df' with hint)
for i in g:qs_enable_char_list
execute 'noremap <expr> <silent>' . i . " Quick_scope_selective('". i . "')"
endfor
" endif
set wildignore+=*/Deploy/*,*/node_modules/*,*/build/*,*/lib/*,*/jspm_packages/*
set completeopt=longest,menu,menuone set completeopt=longest,menu,menuone