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

rmbl · Nov 3, 2013 · b72cf87 · b72cf87
2 parents 765f2ab + 9b70608
commit b72cf87
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -76,3 +76,9 @@
 [submodule "vim/bundle/vim-golang"]
 	path = vim/bundle/vim-golang
 	url = https://github.com/jnwhiteh/vim-golang
+[submodule "vim/bundle/handlebars"]
+	path = vim/bundle/handlebars
+	url = git://github.com/nono/vim-handlebars.git
+[submodule "vim/bundle/editorconfig"]
+	path = vim/bundle/editorconfig
+	url = https://github.com/editorconfig/editorconfig-vim.git
diff --git a/bashrc b/bashrc
@@ -20,7 +20,6 @@ alias nano='vim'
 alias vi='vim'
 
 # Custom stuff
-set -o vi
 export EDITOR="vim"
 export TERM=xterm-256color
 

diff --git a/vim/bundle/editorconfig b/vim/bundle/editorconfig
diff --git a/vim/bundle/handlebars b/vim/bundle/handlebars
diff --git a/vimrc b/vimrc
@@ -63,6 +63,7 @@ let g:ctrlp_max_files = 15000
 " Airline
 let g:airline_enable_branch = 1
 let g:airline_enable_syntastic = 1
+let g:airline_enable_tagbar = 0
 "let g:airline_theme = 'powerlineish'
 let g:airline_theme = 'murmur'
 let g:airline_powerline_fonts = 1
@@ -80,8 +81,8 @@ map <C-f> :NERDTreeToggle<CR>
 map <C-t> :TagbarToggle<CR>
 
 " Bind buffer switching to Ctrl+Tab
-map <C-Tab> :bnext<cr>
-map <C-S-Tab> :bprevious<cr>
+map <C-Tab> :bnext<CR>
+map <C-S-Tab> :bprevious<CR>
 
 autocmd filetype svn,*commit* setlocal spell