From 0ac6b8cfcda9989828a2c7253e8122f6cbf95764 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Sun, 29 Nov 2015 18:25:02 -0500
Subject: [PATCH] Add vim terminal key maps

---
 vim/ftdetect/dart.vim |  1 -
 vimrc                 | 36 +++++++++++++++++-------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 vim/ftdetect/dart.vim

diff --git a/vim/ftdetect/dart.vim b/vim/ftdetect/dart.vim
deleted file mode 100644
index a9e68c9..0000000
--- a/vim/ftdetect/dart.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.dart set filetype=dart
diff --git a/vimrc b/vimrc
index 71c9f77..ec423cb 100644
--- a/vimrc
+++ b/vimrc
@@ -17,6 +17,7 @@ Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-classpath'
 Plug 'Valloric/YouCompleteMe'
 Plug 'rking/ag.vim'
+Plug 'scrooloose/syntastic'
 
 " Colors
 Plug 'reedes/vim-colors-pencil'
@@ -102,9 +103,6 @@ set undoreload=10000
 " When loading text files, wrap them and don't split up words.
 au BufNewFile,BufRead *.txt setlocal wrap
 au BufNewFile,BufRead *.txt setlocal lbr
-" Clojurescript syntax highlighting
-" au BufNewFile,BufRead *.cljs set filetype=clojure
-" au BufNewFile,BufRead *.cljc set filetype=clojure
 
 " Remove trailing whitespace on save all files.
 au BufWritePre * :%s/\s\+$//e
@@ -230,23 +228,28 @@ command! Qall qall
 " Disable Ex mode
 map Q <Nop>
 
+" Terminal mapping
+map <leader>t :terminal<cr>
+tnoremap <leader>e <C-\><C-n>
+tnoremap <A-h> <C-\><C-n><C-w>h
+tnoremap <A-j> <C-\><C-n><C-w>j
+tnoremap <A-k> <C-\><C-n><C-w>k
+tnoremap <A-l> <C-\><C-n><C-w>l
+nnoremap <A-h> <C-w>h
+nnoremap <A-j> <C-w>j
+nnoremap <A-k> <C-w>k
+nnoremap <A-l> <C-w>l
+
 " 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>
 
-" Terminal mapping
-map <leader>t :terminal<cr>
-"tnoremap <leader>e <C-\><C-n>
-"tnoremap <A-h> <C-\><C-n><C-w>h
-"tnoremap <A-j> <C-\><C-n><C-w>j
-"tnoremap <A-k> <C-\><C-n><C-w>k
-"tnoremap <A-l> <C-\><C-n><C-w>l
-"nnoremap <A-h> <C-w>h
-"nnoremap <A-j> <C-w>j
-"nnoremap <A-k> <C-w>k
-"nnoremap <A-l> <C-w>l
+" Make it easier to jump around the command line. The default behaviour is
+" using the arrow keys with or without shift
+:cnoremap <C-J> <S-Left>
+:cnoremap <C-K> <S-Right>
 
 " Window splitting - couldn't figure out how to remap <c-w>v & <c-w>n to <c-m>
 " & <c-n>
@@ -271,10 +274,6 @@ endfunction
 call MapCR()
 nnoremap <leader><leader> <c-^>
 
-" Make it easier to jump around the command line. The default behaviour is
-" using the arrow keys with or without shift
-:cnoremap <C-J> <S-Left>
-:cnoremap <C-K> <S-Right>
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " ABBREVIATIONS
@@ -297,7 +296,6 @@ endfunction
 inoremap <tab> <c-r>=InsertTabWrapper()<cr>
 inoremap <s-tab> <c-n>
 
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " RENAME CURRENT FILE
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""