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

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index abda3741333186cf1e8bc2fa685b5227e5063f6f..eea2e288fd47949f43eb1b82118d1c8f639aaf4a 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


@@ -145,11 +146,7 @@ endif
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>

-
-" Mapping for CommandTBuffer
-map <Leader>t :CtrlP<CR>
-map <Leader>T :CtrlPBuffer<CR>
-map <Leader>R :CtrlPClearCache<CR>
+let g:tagbar_ctags_bin="/usr/local/bin/ctags"

 
 " Color Column
 set colorcolumn=81
 
 " Color Column
 set colorcolumn=81


@@ -162,3 +159,10 @@ 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'
+
+" Fix CtrlP root folder and add some ignores
+let g:ctrlp_working_path_mode = 0
+let g:ctrlp_custom_ignore = '\v[\/](\.(git|hg|svn)|node_modules|DS_Store)$'