Update gitmodules

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index abda3741333186cf1e8bc2fa685b5227e5063f6f..bc9d40ba4edd220f932b262660a13a8b3a08a3b9 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,11 +121,11 @@ 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
 
 " 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,41 @@ set foldmethod=syntax
 set foldnestmax=10
 set nofoldenable
 set foldlevel=1
 set foldnestmax=10
 set nofoldenable
 set foldlevel=1

+
+" powerline stuff
+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
+
+nnoremap <C-n> :call NumberToggle()<cr>
+
+" Find file and Find stuff to quickfix.
+command -nargs=1 Qff :cexpr system('find . \| ag <f-args>') | copen
+
+function! ToggleCWindow()
+  if exists("g:qwindow")
+    cclose
+    unlet g:qwindow
+  else
+    copen
+    let g:qwindow = 1
+  endif
+endfunction
+nnoremap <C-h> :call ToggleCWindow()<cr>