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

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index 1cefa7773f1da34d64e881e6b54a42be845a363e..5ce3d57965845933decc73e23c4f237acb08a446 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -80,6 +80,7 @@ set backspace=indent,eol,start
 
 " load the plugin and indent settings for the detected filetype
 filetype plugin indent on
 
 " load the plugin and indent settings for the detected filetype
 filetype plugin indent on

+filetype plugin on

 
 " Opens an edit command with the path of the currently edited file filled in
 " Normal mode: <Leader>e
 
 " Opens an edit command with the path of the currently edited file filled in
 " Normal mode: <Leader>e


@@ -123,8 +124,8 @@ set t_Co=256
 color railscasts
 
 " Directories for swp files
 color railscasts
 
 " Directories for swp files

-set backupdir=~/.vim/backup
-set directory=~/.vim/backup
+set backupdir=~/.vim/.backup
+set directory=~/.vim/.backup

 
 " Turn off jslint errors by default
 let g:JSLintHighlightErrorLine = 0
 
 " Turn off jslint errors by default
 let g:JSLintHighlightErrorLine = 0


@@ -157,3 +158,6 @@ set foldmethod=syntax
 set foldnestmax=10
 set nofoldenable
 set foldlevel=1
 set foldnestmax=10
 set nofoldenable
 set foldlevel=1

+
+" powerline stuff
+let g:Powerline_symbols = 'fancy'