Merge branch 'master' of github.com:ryanc/dotfiles

This commit is contained in:
Ryan Cavicchioni 2014-07-10 01:03:12 -05:00
commit d5cd4e6013
4 changed files with 6 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
!.vim/bundle/Vundle.vim
.vim/bundle/*
.vim/swp/*

6
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule ".vim/bundle/vundle"]
path = .vim/bundle/vundle
url = https://github.com/gmarik/vundle.git
[submodule ".vim/bundle/Vundle.vim"]
path = .vim/bundle/Vundle.vim
url = https://github.com/gmarik/Vundle.vim.git

@ -0,0 +1 @@
Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5

View File

@ -70,6 +70,7 @@ au FileType yaml set tabstop=2 shiftwidth=2 softtabstop=2
au FileType php set tabstop=4 shiftwidth=4 softtabstop=4
au FileType make set noexpandtab
au FileType ruby,eruby setlocal ts=2 sw=2 tw=79 et sts=2 autoindent colorcolumn=80
au FileType puppet setlocal ts=2 sw=2 tw=80 et sts=2 autoindent colorcolumn=80
" keyboard shortcuts
nmap <silent> <leader>l :set list!<CR>