From d23254e3a0938e7beecf0bce5d24fdcfdda78c5f Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sun, 10 Feb 2013 09:45:45 -0600
Subject: [PATCH] Added clear search on <esc> and cleaned up vimrc

+ mapped <esc> to also clear highlighted search
+ cleaned up unused mappings, comments, etc. from the vimrc
---
 vim/vimrc.symlink | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index afb1a28..0b78535 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -11,7 +11,7 @@ Bundle 'gmarik/vundle'
 Bundle 'kien/ctrlp.vim'
 Bundle 'scrooloose/nerdtree'
 Bundle 'mileszs/ack.vim'
-Bundle 'scrooloose/syntastic'
+" Bundle 'scrooloose/syntastic'
 Bundle 'Raimondi/delimitMate'
 Bundle 'tpope/vim-commentary'
 Bundle 'tpope/vim-endwise'
@@ -33,6 +33,7 @@ Bundle 'nono/vim-handlebars'
 Bundle 'tsaleh/vim-matchit'
 Bundle 'benmills/vimux'
 Bundle 'mattn/zencoding-vim'
+Bundle 'int3/vim-taglist-plus'
 
 filetype plugin indent on
 
@@ -194,16 +195,17 @@ set laststatus=2 " show the satus line all the time
 " General mappings/shortcuts for functionality
 " Additional, plugin-specific mappings are located under
 " the plugins section
-"
-" nnoremap K :q<cr>
 
-" remap esc and disable to force learning
+" clear search results on escape
+nnoremap <silent> <esc> :nohlsearch<cr><esc>
+
+" remap esc
 inoremap jk <esc>
-" inoremap <esc> <nop>
 
 " remove extra whitespace
 nmap <leader><space> :%s/\s\+$<cr>
 
+" shortcut to save
 nmap <leader>, :w<cr>
 
 " set paste toggle
@@ -260,24 +262,11 @@ map <silent> <C-j> :call WinMove('j')<cr>
 map <silent> <C-k> :call WinMove('k')<cr>
 map <silent> <C-l> :call WinMove('l')<cr>
 
-" nnoremap <C-S-H> :vertical resize -5<cr>
-" nnoremap <C-S-J> :resize +5<cr>
-" nnoremap <C-S-K> :resize -5<cr>
-" nnoremap <C-S-L> :vertical resize +5<cr>
-
 map <leader>wc :wincmd q<cr>
 
 " equalize windows
 map <leader>= <C-w>=
 
-" Edit Shortcuts
-" these automatically populate the current filepath
-cnoremap %% <C-R>=expand('%:h').'/'<cr>
-map <leader>ew :e %%
-map <leader>es :sp %%
-map <leader>ev :vsp %%
-map <leader>et :tabe %%
-
 " toggle cursor line
 nnoremap <leader>i :set cursorline!<cr>