aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rw-r--r--vim/autocmd.vim4
-rw-r--r--vim/bundles.vim3
2 files changed, 5 insertions, 2 deletions
diff --git a/vim/autocmd.vim b/vim/autocmd.vim
index 055e03d..cbba932 100644
--- a/vim/autocmd.vim
+++ b/vim/autocmd.vim
@@ -3,11 +3,11 @@
" 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 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 shiftwidth=4 tabstop=4
+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
diff --git a/vim/bundles.vim b/vim/bundles.vim
index c221c10..bdf0f4b 100644
--- a/vim/bundles.vim
+++ b/vim/bundles.vim
@@ -25,6 +25,9 @@ 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"