Enable esc again

diff --git a/vimrc b/vimrc
index e76934f0d915ba6147fa334b69bbb5d05288dce6..eeda3c9927b1e0bc311a838716145feba800f7ad 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -124,21 +124,21 @@ let &t_SI.="\e[5 q"
 let &t_EI.="\e[1 q"
 let &t_te.="\e[0 q"
 
-"Basic Mappings
+" Mappings
 let mapleader = "\<space>"
 
-noremap <c-h>                 <c-w><c-h>
-noremap <c-j>                 <c-w><c-j>
-noremap <c-k>                 <c-w><c-k>
-noremap <c-l>                 <c-w><c-l>
-noremap! <C-a>                <Home>
-noremap! <C-e>                <End>
-
-" Normal Mode Mappings
-"nnoremap hh                       <nop>
-"nnoremap jj                       <nop>
-"nnoremap kk                       <nop>
-"nnoremap ll                       <nop>
+noremap <C-h>                 <C-w><C-h>
+noremap <C-j>                 <C-w><C-j>
+noremap <C-k>                 <C-w><C-k>
+noremap <C-l>                 <C-w><C-l>
+
+" Terminal Mode
+tnoremap <C-h>              <C-\><C-n><C-w>h
+tnoremap <C-j>              <C-\><C-n><C-w>j
+tnoremap <C-k>              <C-\><C-n><C-w>k
+tnoremap <C-l>              <C-\><C-n><C-w>l
+
+" Normal Mode
 nnoremap ;                        :
 nnoremap :                        ;
 nnoremap n                        nzzzv
@@ -154,31 +154,20 @@ nnoremap <silent><Leader>t        :TagbarToggle<CR>
 "nnoremap <silent><leader>html     :-1read ~/.vim/template/html<CR>3jwf>a
 "nnoremap <silent><leader>php      :-1read ~/.vim/template/php<CR>2ja
 
-"" Visual Mode Mappings
+"" Visual Mode
 vnoremap jk                       <esc>
-vnoremap <esc>                    <nop>
 vmap < <gv
 vmap > >gv
 
-" Insert Mode Mappings
+" Insert Mode
 inoremap jk                       <esc>
-inoremap <esc>                    <nop>
-inoremap <silent><leader>m        <Esc>:wa<CR>:Make<CR>i
 inoremap <C-U> <C-G>u<C-U>
 
-" Command Mode Mappings
+" Command Mode
 cnoremap <C-p> <Up>
 cnoremap <C-n> <Down>
-
-" Command aliases
 cnoreabbrev w!!      w !sudo tee "%"
 
-" Termninal Mappings
-tnoremap <C-h>              <C-\><C-n><C-w>h
-tnoremap <C-j>              <C-\><C-n><C-w>j
-tnoremap <C-k>              <C-\><C-n><C-w>k
-tnoremap <C-l>              <C-\><C-n><C-w>l
-
 " Functions
 
 " grep