From 9574e62f4f1f7df7ad55c686e2b9f4f38a97c33e Mon Sep 17 00:00:00 2001
From: Bodaniel Jeanes <me@bjeanes.com>
Date: Wed, 28 Dec 2011 21:00:49 -0600
Subject: [PATCH] Reorganize vimrc and remove unused mapping

---
 editors/vim/ui.vim |  3 +++
 editors/vim/vimrc  | 18 ++----------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/editors/vim/ui.vim b/editors/vim/ui.vim
index 45a0081..58e48ba 100644
--- a/editors/vim/ui.vim
+++ b/editors/vim/ui.vim
@@ -121,6 +121,9 @@ syntax on
   " For when other people use my setup
   nmap \ <Leader>
 
+  " OS X clipboard when yanking/pasting
+  set clipboard=unnamed
+
   " May only work in iTerm2 and may have other bad effects,
   " but this shows a block in normal mode, and vertical bar
   " in insert mode.
diff --git a/editors/vim/vimrc b/editors/vim/vimrc
index b837c99..7ea4010 100644
--- a/editors/vim/vimrc
+++ b/editors/vim/vimrc
@@ -21,17 +21,8 @@ set tags=tmp/tags;/,./tmp/tags;/,tags;/,./tags;/
 " ,w - write file
 nnoremap <silent> ,w :write<CR>
 
-" ,N - toggle line numbers
-function! ToggleLineNumbers()
-  if &number
-    set nonumber
-  elseif &relativenumber
-    set number
-  else
-    set relativenumber
-  endif
-endfunction
-nnoremap <silent> ,N :call ToggleLineNumbers()<CR>
+set pastetoggle=<Leader>p
+map <leader>p :set invpaste paste?<CR>
 
 " Theme development help
 nmap <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
@@ -43,12 +34,7 @@ map <Leader>vv :edit $MYVIMRC<CR>
 map <Leader>gg :edit $MYGVIMRC<CR>
 map <Leader>.. :cd ~/.config<CR>:enew<CR>
 
-set pastetoggle=<Leader>p
-map <leader>p :set invpaste paste?<CR>
-
 if filereadable(expand('~/.vimrc.local'))
   source ~/.vimrc.local
 endif
 
-" OS X clipboard when yanking/pasting
-set clipboard=unnamed