Skip to content

Commit

Permalink
Improve vimrc
Browse files Browse the repository at this point in the history
  • Loading branch information
szw committed Aug 30, 2015
1 parent b07d723 commit 72f9855
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set nocompatible
set hidden
set smartindent autoindent
set tabstop=4 shiftwidth=4 softtabstop=4 expandtab
set tabstop=8 shiftwidth=8 softtabstop=8 noexpandtab
set number
set nowrap
set hls
Expand Down Expand Up @@ -71,7 +71,6 @@ Plugin 'tpope/vim-rails'
Plugin 'tpope/vim-rake'
Plugin 'tpope/vim-repeat'
Plugin 'tpope/vim-rvm'
Plugin 'tpope/vim-sleuth'
Plugin 'tpope/vim-surround'
Plugin 'tpope/vim-unimpaired'
Plugin 'tpope/vim-vinegar'
Expand Down Expand Up @@ -208,7 +207,6 @@ augroup END
augroup PHP
au!
au FileType php setlocal omnifunc=phpcomplete#CompletePHP
au FileType php setlocal tabstop=4 shiftwidth=4 noexpandtab
" au FileType php,html filetype indent off
" au FileType php au InsertLeave * pclose
augroup END
Expand Down Expand Up @@ -240,13 +238,12 @@ augroup END

augroup Vimscript
au!
au FileType vim setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab
au FileType vim setlocal isk-=-
augroup END

augroup Javascript
au!
au FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS tabstop=4 softtabstop=4 shiftwidth=4 expandtab
au FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
augroup END

augroup CoffeeScript
Expand All @@ -262,7 +259,6 @@ augroup END
augroup Css
au!
au FileType css,scss setlocal omnifunc=csscomplete#CompleteCSS
au FileType scss setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab
augroup END

augroup Xml
Expand Down Expand Up @@ -411,3 +407,7 @@ let g:vim_tags_auto_generate = 0
" vim-go
" let g:go_auto_type_info = 1
let g:go_autodetect_gopath = 0
au FileType go nnoremap <silent><buffer><F1> :GoInfo<CR>
au FileType go nnoremap <silent><buffer><F2> :GoImports<CR>:w<CR>
" au BufWritePre *.go GoImports
" let g:go_fmt_autosave = 0

0 comments on commit 72f9855

Please sign in to comment.