diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim index 88624b5..c77ca5a 100644 --- a/vim/vim.symlink/plugins.vim +++ b/vim/vim.symlink/plugins.vim @@ -44,3 +44,4 @@ Bundle 'garbas/vim-snipmate' Bundle 'terryma/vim-multiple-cursors' Bundle 'tpope/vim-repeat' Bundle 'tonchis/to-github-vim' +Bundle 'sotte/presenting.vim' diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index a87506b..8088d3a 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -66,6 +66,7 @@ if has("autocmd") && !exists("autocommands_loaded") autocmd FileType ruby setlocal ts=2 sts=2 sw=2 expandtab autocmd FileType html setlocal ts=4 sts=4 sw=4 noexpandtab indentkeys-=* autocmd FileType jade setlocal ts=2 sts=2 sw=2 noexpandtab + autocmd FileType *.md.js :call SyntasticReset "autocmd WinEnter * setlocal cursorline "autocmd WinLeave * setlocal nocursorline @@ -245,13 +246,13 @@ nnoremap k gk nnoremap / :call ToggleNuMode() " find out what syntax stack a statement belongs to -nmap s :call SynStack() +" nmap s :call SynStack() autocmd! BufEnter * call ApplyLocalSettings(expand(":p:h")) " inoremap =Smart_TabComplete() map r :call RunCustomCommand() -map s :call SetCustomCommand() +" map s :call SetCustomCommand() let g:silent_custom_command = 0 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -282,6 +283,9 @@ let g:ctrlp_working_path_mode = 'ra' nmap gs :Gstatus nmap ge :Gedit +" toggle syntastic +nmap s :SyntasticToggleMode + " CtrlP ignore patterns let g:ctrlp_custom_ignore = { \ 'dir': '\.git$\|node_modules$\|\.hg$\|\.svn$', @@ -299,9 +303,12 @@ let g:airline_theme='dark' if (has("gui_running")) set guioptions=egmrt + set background=light + colorscheme solarized let g:airline_left_sep='' let g:airline_right_sep='' let g:airline_powerline_fonts=0 + let g:airline_theme='solarized' endif let vimrc_already_sourced = 1