From 103ce0c6cadce4192cc4bd92dc0b656d45800ce7 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Fri, 16 Nov 2012 01:05:17 -0500
Subject: [PATCH] Fix ctrlp remapping and add split window movement

---
 .vimrc | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/.vimrc b/.vimrc
index a0204a6..ea1e9e5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,5 @@
+let mapleader=","
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " PLUGINS
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -8,18 +10,15 @@ call pathogen#helptags()
 set runtimepath^=~/.vim/bundle/ctrlp.vim
 let g:ctrlp_map = '<leader>ff'
 let g:ctrlp_cmd = 'CtrlP'
-
-map <leader>fR :call ShowRoutes()<cr>
-nmap <leader>fv :CtrlP app/views<cr>
-nmap <leader>fc :CtrlP app/controllers<cr>
-nmap <leader>fm :CtrlP app/models<cr>
-map <leader>fh :CtrlP app/helpers<cr>
-map <leader>fl :CtrlP<cr> lib<cr>
-map <leader>fp :CtrlP public<cr>
-map <leader>fs :CtrlP app/views/stylesheets<cr>
-map <leader>gg :topleft 100 :split Gemfile<cr>
-
 let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
+map <leader>fR :call ShowRoutes()<cr>
+map <leader>fv :CtrlP app/views<cr>
+map <leader>fc :CtrlP app/controllers<cr>
+map <leader>fm :CtrlP app/models<cr>
+map <leader>fh :CtrlP app/helpers<cr>
+map <leader>fl :CtrlP lib<cr>
+map <leader>fp :CtrlP public<cr>
+map <leader>fs :CtrlP app/stylesheets<cr>
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " BASIC EDITING CONFIGURATION
@@ -98,8 +97,6 @@ augroup END
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " MISC KEY MAPS
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-let mapleader=","
-
 " insert an end tag with <c-e>
 imap <c-e> end
 
@@ -109,7 +106,7 @@ imap <c-l> <space>=><space>
 " set esc to <c-c>
 imap <c-c> <esc>
 
-" remap semicovlon
+" remap semicolon
 nmap <leader>. :
 
 " Quickly edit/reload the vimrc file
@@ -126,6 +123,14 @@ nmap <leader>x :x<cr>
 :ca W w
 :ca Q q
 
+" Map ctrl-movement keys to window switching
+map <c-k> <c-w><Up>
+map <c-j> <c-w><Down>
+map <c-l> <c-w><Right>
+map <c-h> <c-w><Left>
+
+map <leader>gg :topleft 100 :split Gemfile<cr>
+
 " Clear the search buffer (highlighting) when hitting return
 function! MapCR()
   nnoremap <cr> :nohlsearch<cr>