From d9a59e83c710b5bf8111d47c91c7a479fce56c00 Mon Sep 17 00:00:00 2001
From: Caleb Taylor <aquaductape@gmail.com>
Date: Thu, 8 Aug 2019 05:29:33 -0700
Subject: [PATCH] changed easymotion mappings

---
 README.md                 | 17 +++--------------
 vimrcs/basic.vim          |  5 +----
 vimrcs/plugins_config.vim | 14 --------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 45419540..abbe0357 100644
--- a/README.md
+++ b/README.md
@@ -77,23 +77,9 @@ Some mappings are commented out
 
 `plugins_config.vim`
 
-    let g:EasyMotion_do_mapping = 0 " Disable default mappings
-
-    " Jump to anywhere you want with minimal keystrokes, with just one key binding.
-    " `s{char}{label}`
-    nmap s <Plug>(easymotion-overwin-f)
-    " or
-    " `s{char}{char}{label}`
-    " Need one more keystroke, but on average, it may be more comfortable.
-    nmap s <Plug>(easymotion-overwin-f2)
-
     " Turn on case-insensitive feature
     let g:EasyMotion_smartcase = 1
 
-    " JK motions: Line motions
-    map <Leader>j <Plug>(easymotion-j)
-    map <Leader>k <Plug>(easymotion-k)
-
     " Open a NERDTree automatically when vim starts up if no files were specified
     autocmd StdinReadPre * let s:std_in=1
     autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
@@ -113,6 +99,9 @@ Some mappings are commented out
 `basic.vim`
 
     map <leader>pp :setlocal paste!<cr>
+    " Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
+    map <space> /
+    map <c-space> ?
 
 `plugins_config.vim`
 
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index e9149329..9d3e7d21 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -211,9 +211,6 @@ vnoremap <silent> # :<C-u>call VisualSelection('', '')<CR>?<C-R>=@/<CR><CR>
 map j gj
 map k gk
 
-" Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
-map <space> /
-map <c-space> ?
 
 " Disable highlight when <leader><cr> is pressed
 map <silent> <leader><cr> :noh<cr>
@@ -294,7 +291,7 @@ map H ^
 map L $
 
 " Clears highlighting 
-map <C-n> :noh<return>                             
+map <C-n> :noh<cr>                             
 
 " Replace word by occurence, press '.' to move to the next occurence which auto replaces with new word. I use it to rename variables. So far I haven't found a mapping that does it by scope reliably like vscode.
 nnoremap gr *``cgn
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 08110bf4..95d70644 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -78,23 +78,9 @@ set grepprg=/bin/grep\ -nH
 " => EasyMotion
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-let g:EasyMotion_do_mapping = 0 " Disable default mappings
-
-" Jump to anywhere you want with minimal keystrokes, with just one key binding.
-" `s{char}{label}`
-nmap s <Plug>(easymotion-overwin-f)
-" or
-" `s{char}{char}{label}`
-" Need one more keystroke, but on average, it may be more comfortable.
-nmap s <Plug>(easymotion-overwin-f2)
-
 " Turn on case-insensitive feature
 let g:EasyMotion_smartcase = 1
 
-" JK motions: Line motions
-map <Leader>j <Plug>(easymotion-j)
-map <Leader>k <Plug>(easymotion-k)
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Nerd Tree
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""