A whole bunch of new additions to the submodules

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index 8b575bc3a0d7462397e5b129ffd9c70b05b4169a..a9c30a0315cc6355a3c59f771f71faa82a6e0611 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


@@ -120,7 +121,7 @@ set modelines=10
 
 " Default color scheme
 set t_Co=256
 
 " Default color scheme
 set t_Co=256

-color railscasts
+color molokai

 
 " Directories for swp files
 set backupdir=~/.vim/.backup
 
 " Directories for swp files
 set backupdir=~/.vim/.backup


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

+let g:tagbar_ctags_bin="/usr/local/bin/ctags"

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


@@ -159,7 +161,25 @@ set nofoldenable
 set foldlevel=1
 
 " powerline stuff
 set foldlevel=1
 
 " powerline stuff

-let g:Powerline_symbols = 'fancy'
+set rtp+=~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim
+
+" 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)$'
+let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files']
+
+" Relative numbers
+autocmd FocusLost * :set number
+autocmd InsertEnter * :set number
+autocmd InsertLeave * :set relativenumber
+autocmd CursorMoved * :set relativenumber
+
+function! NumberToggle()
+  if(&relativenumber == 1)
+    set number
+  else
+    set relativenumber
+  endif
+endfunction

 
 

-" node cleaning
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
+nnoremap <C-n> :call NumberToggle()<cr>