nvim: Drop incremental search as in-built suffices

Also use vim-searchlight for search highlighting the word under cursor.
Add custom highlight color to make the word being searched under cursor
stand out for our color schemes and better key mappings to shift through
searches in command line.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>

nvim/.config/nvim/after/plugin/incsearch.vim

@@ -1,9 +0,0 @@
-map /  <Plug>(incsearch-forward)
-map ?  <Plug>(incsearch-backward)
-map g/ <Plug>(incsearch-stay)
-map n  <Plug>(incsearch-nohl-n)
-map N  <Plug>(incsearch-nohl-N)
-map *  <Plug>(incsearch-nohl-*)
-map #  <Plug>(incsearch-nohl-#)
-map g* <Plug>(incsearch-nohl-g*)
-map g# <Plug>(incsearch-nohl-g#)

nvim/.config/nvim/autocmd.vim

@@ -9,6 +9,11 @@ augroup ResizeWindowsProportionally
   autocmd VimResized * :wincmd =
 augroup END
 
+augroup ToggleSearchHighlighting
+  autocmd!
+  autocmd InsertEnter * setlocal nohlsearch
+augroup END
+
 augroup UserStatusline
   autocmd!
   autocmd BufEnter,WinEnter,TermOpen * setlocal statusline=%!ActiveStatus()

nvim/.config/nvim/colors/molokai.vim

@@ -115,6 +115,8 @@ hi NonText         guifg=#465457
 hi SpecialKey      guifg=#465457
 hi Conceal         guifg=#f92672 guibg=bg
 
+hi Searchlight     guifg=#FF00FF guibg=#000000
+
 " Must be at the end, because of ctermbg=234 bug.
 " https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
 set background=dark

nvim/.config/nvim/colors/wombat.vim

@@ -92,5 +92,7 @@ hi link MoreMsg Question
 
 hi ModeMsg      guifg=#F6F3E8 guibg=NONE    gui=NONE
 
+hi Searchlight  guifg=#FF00FF guibg=#000000
+
 " Custom stuff
 hi Modified guifg=black guibg=#FFA500 

nvim/.config/nvim/init.vim

@@ -5,7 +5,7 @@ Plug 'justinmk/vim-sneak'
 " Search
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
-Plug 'haya14busa/incsearch.vim'
+Plug 'PeterRincker/vim-searchlight'
 Plug 'wincent/ferret'
 " Remove extraneous whitespace when edit mode is exited
 Plug 'axelf4/vim-strip-trailing-whitespace'

nvim/.config/nvim/keymappings.vim

@@ -126,11 +126,21 @@ nnoremap <silent> <LocalLeader> :<C-U>WhichKey ','<CR>
 nnoremap <C-\> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
 nnoremap <A-]> :sp <CR>:exec("tag ".expand("<cword>"))<CR>
 
+" Use Tab & S-Tab instead of C-g and C-t for incsearch
+cno <expr> <Tab>   getcmdtype() =~ '[?/]' ? '<C-g>' : feedkeys('<Tab>', 'int')[1]
+cno <expr> <S-Tab> getcmdtype() =~ '[?/]' ? '<C-t>' : feedkeys('<S-Tab>', 'int')[1]
+nnoremap <silent> <Leader>n :nohlsearch<CR>
+
 " Move across wrapped lines like regular lines
 " Go to the first non-blank character of a line
 noremap 0 ^
 " Just in case you need to go to the very beginning of a line
 noremap ^ 0
+" Centre the window on each search movement
+nnoremap n nzz
+nnoremap N Nzz
+vnoremap n nzz
+vnoremap N Nzz
 
 " Make dot work on visually selected lines
 vnoremap . :norm.<CR>