Skip to content

Commit

Permalink
Update vimrc
Browse files Browse the repository at this point in the history
  • Loading branch information
Vegard Sandengen committed Jan 14, 2016
1 parent 3edee0a commit c199872
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions dot.vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ set tm=500
" Enable syntax highlighting
syntax enable

colorscheme desert
set background=dark
"colorscheme desert
"set background=dark

" Set extra options when running in GUI mode
if has("gui_running")
Expand Down Expand Up @@ -403,12 +403,6 @@ function! <SID>BufcloseCloseIt()
endif
endfunction

" PyDiction shiz
filetype plugin on
filetype off "force entire reload
filetype plugin indent on
let g:pydiction_location = '~/.vim/after/ftplugin/pydiction/complete-dict'

" Autocomplete already-existing words in the file with tab (extremely useful!)
"function InsertTabWrapper()
" let col = col('.') - 1
Expand All @@ -424,7 +418,7 @@ let g:pydiction_location = '~/.vim/after/ftplugin/pydiction/complete-dict'
"========================================

:autocmd FileType make set noexpandtab
:autocmd FileType c set shiftwidth=2 | set tabstop=2 | set expandtab
:autocmd FileType c set shiftwidth=4 | set tabstop=4 | set expandtab
:autocmd FileType eruby set shiftwidth=2 | set tabstop=2 | set expandtab
:autocmd FileType html set shiftwidth=2 | set tabstop=2 | set expandtab
:autocmd FileType ruby set shiftwidth=2 | set tabstop=2 | set expandtab
Expand All @@ -435,6 +429,8 @@ let g:pydiction_location = '~/.vim/after/ftplugin/pydiction/complete-dict'
:autocmd FileType yaml set shiftwidth=2 | set tabstop=2 | set expandtab
:autocmd FileType tex set tw=100
:autocmd FileType go set shiftwidth=4 | set tabstop=4 | set noexpandtab
:autocmd FileType xml set shiftwidth=4 | set tabstop=4 | set expandtab
:autocmd FileType xsd set shiftwidth=2 | set tabstop=2 | set expandtab

"Gherkin markup. Need to have the ~/.vim/syntax/cucumber.vim present. Get one from
"https://raw.github.com/tpope/vim-cucumber/master/syntax/cucumber.vim
Expand Down

0 comments on commit c199872

Please sign in to comment.