Removed CLI colors from colorscheme as is handled by `CSapprox`

* added mouse support to terminal vim
* refined vim search configuration

2 files changed, 74 insertions, 67 deletions

diff --git a/vim/.vim/colors/akr.vim b/vim/.vim/colors/akr.vim
index 323c382..e5e16a8 100644
--- a/vim/.vim/colors/akr.vim
+++ b/vim/.vim/colors/akr.vim
@@ -3,75 +3,77 @@ syntax  reset
 let     background     =              "dark"
 let     g:colors_name  =              "akr"
 
-hi      Normal         gui=NONE       cterm=NONE       guifg=#F2F2F2  guibg=#171717  ctermfg=8     ctermbg=0
-hi      NonText        gui=NONE       cterm=NONE       guifg=#171717  guibg=#171717  ctermfg=0     ctermbg=0
-hi      LineNr         gui=NONE       cterm=NONE       guifg=#605c5a  guibg=NONE     ctermfg=7     ctermbg=NONE
-hi      Cursor         gui=reverse    cterm=reverse    guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      CursorColumn   gui=NONE       cterm=NONE       guifg=NONE     guibg=#000000  ctermfg=NONE
-hi      CursorLine     gui=NONE       cterm=NONE       guifg=NONE     guibg=#212121  ctermfg=NONE
-hi      CursorLineNr   gui=NONE       cterm=NONE       guifg=NONE     guibg=#212121  ctermfg=NONE
+hi      Normal         gui=NONE       guifg=#F2F2F2  guibg=#171717
+hi      NonText        gui=NONE       guifg=#171717  guibg=#171717
+hi      LineNr         gui=NONE       guifg=#605c5a  guibg=NONE
+hi      Cursor         gui=reverse    guifg=NONE     guibg=NONE
+hi      CursorColumn   gui=NONE       guifg=NONE     guibg=#000000
+hi      CursorLine     gui=NONE       guifg=NONE     guibg=#212121
+hi      CursorLineNr   gui=NONE       guifg=NONE     guibg=#212121
 
-hi      TabLine        gui=NONE       cterm=NONE       guifg=#909636  guibg=#171717  ctermfg=10    ctermbg=0
-hi      TabLineFill    gui=NONE       cterm=NONE       guifg=NONE     guibg=#262626  ctermfg=NONE  ctermbg=0
-hi      TabLineSel     gui=NONE       cterm=NONE       guifg=#171717  guibg=#909636  ctermfg=0     ctermbg=10
-hi      StatusLine     gui=NONE       cterm=NONE       guifg=#909636  guibg=#212121  ctermfg=10    ctermbg=0
-hi      StatusLineNC   gui=NONE       cterm=NONE       guifg=#909637  guibg=#212121  ctermfg=2     ctermbg=0
-hi      VertSplit      gui=NONE       cterm=NONE       guifg=#262626  guibg=#262626  ctermfg=0     ctermbg=0
-hi      Visual         gui=NONE       cterm=NONE       guifg=#E4E093  guibg=#8C3346  ctermfg=3     ctermbg=1
-hi      VisualNOS      gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
+hi      TabLine        gui=NONE       guifg=#909636  guibg=#171717
+hi      TabLineFill    gui=NONE       guifg=NONE     guibg=#262626
+hi      TabLineSel     gui=NONE       guifg=#171717  guibg=#909636
+hi      StatusLine     gui=NONE       guifg=#909636  guibg=#212121
+hi      StatusLineNC   gui=NONE       guifg=#909637  guibg=#212121
+hi      VertSplit      gui=NONE       guifg=#262626  guibg=#262626
+hi      Visual         gui=NONE       guifg=#E4E093  guibg=#8C3346
+hi      VisualNOS      gui=NONE       guifg=NONE     guibg=NONE
 
-hi      Pmenu          gui=NONE       cterm=NONE       guifg=NONE     guibg=#000000  ctermfg=NONE  ctermbg=0
-hi      PmenuSbar      gui=NONE       cterm=NONE       guifg=NONE     guibg=#262626  ctermfg=NONE
-hi      PmenuSel       gui=NONE       cterm=NONE       guifg=NONE     guibg=#333333  ctermfg=NONE
-hi      PmenuThumb     gui=NONE       cterm=NONE       guifg=NONE     guibg=#424242  ctermfg=NONE
-hi      DiffAdd        gui=NONE       cterm=NONE       guifg=NONE     guibg=#082608  ctermfg=NONE
-hi      DiffChange     gui=NONE       cterm=NONE       guifg=NONE     guibg=#000000  ctermfg=NONE  ctermbg=0
-hi      DiffDelete     gui=NONE       cterm=NONE       guifg=NONE     guibg=#260808  ctermfg=NONE
-hi      DiffText       gui=NONE       cterm=NONE       guifg=NONE     guibg=#333333  ctermfg=NONE
-hi      Search         gui=NONE       cterm=NONE       guifg=#171717  guibg=#909636  ctermfg=0     ctermbg=10
-hi      IncSearch      gui=NONE       cterm=NONE       guifg=#171717  guibg=#909636  ctermfg=0     ctermbg=10
+hi      Pmenu          gui=NONE       guifg=NONE     guibg=#000000
+hi      PmenuSbar      gui=NONE       guifg=NONE     guibg=#262626
+hi      PmenuSel       gui=NONE       guifg=NONE     guibg=#333333
+hi      PmenuThumb     gui=NONE       guifg=NONE     guibg=#424242
+hi      DiffAdd        gui=NONE       guifg=NONE     guibg=#082608
+hi      DiffChange     gui=NONE       guifg=NONE     guibg=#000000
+hi      DiffDelete     gui=NONE       guifg=NONE     guibg=#260808
+hi      DiffText       gui=NONE       guifg=NONE     guibg=#333333
+hi      Search         gui=NONE       guifg=#171717  guibg=#909636
+hi      IncSearch      gui=NONE       guifg=#171717  guibg=#909636
 
-hi      Comment        gui=italic     cterm=italic     guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      Type           gui=NONE       cterm=NONE       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      Boolean        gui=NONE       cterm=NONE       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      String         gui=NONE       cterm=NONE       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      Number         gui=NONE       cterm=NONE       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      Title          gui=bold       cterm=bold       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      Todo           gui=standout   cterm=standout   guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      Constant       gui=italic     cterm=italic     guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      Identifier     gui=bold       cterm=bold       guifg=#F2F2F2  guibg=#171717  ctermfg=8     ctermbg=0
-hi      Statement      gui=bold       cterm=bold       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      StorageClass   gui=bold       cterm=bold       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      Conditional    gui=bold       cterm=bold       guifg=#aadb0f  guibg=NONE     ctermfg=2     ctermbg=NONE
-hi      MatchParen     gui=bold       cterm=bold       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
+hi      Comment        gui=italic     guifg=#F2F2F2  guibg=NONE
+hi      Type           gui=NONE       guifg=#aadb0f  guibg=NONE
+hi      Boolean        gui=NONE       guifg=#aadb0f  guibg=NONE
+hi      String         gui=NONE       guifg=#aadb0f  guibg=NONE
+hi      Number         gui=NONE       guifg=#aadb0f  guibg=NONE
+hi      Title          gui=bold       guifg=#aadb0f  guibg=NONE
+hi      Todo           gui=standout   guifg=NONE     guibg=NONE
+hi      Constant       gui=italic     guifg=#F2F2F2  guibg=NONE
+hi      Identifier     gui=bold       guifg=#F2F2F2  guibg=#171717
+hi      Statement      gui=bold       guifg=#aadb0f  guibg=NONE
+hi      StorageClass   gui=bold       guifg=#aadb0f  guibg=NONE
+hi      Conditional    gui=bold       guifg=#aadb0f  guibg=NONE
+hi      MatchParen     gui=bold       guifg=NONE     guibg=NONE
 
-hi      Special        gui=NONE       cterm=NONE       guifg=#808080  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      SpecialKey     gui=bold       cterm=bold       guifg=#212121  guibg=NONE     ctermfg=0     ctermbg=NONE
+hi      Special        gui=NONE       guifg=#808080  guibg=NONE
+hi      SpecialKey     gui=bold       guifg=#212121  guibg=NONE
 
-hi      xmlTagName     gui=NONE       cterm=NONE       guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      xmlEndTag      gui=NONE       cterm=NONE       guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      xmlNamespace   gui=bold       cterm=bold       guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
-hi      xmlAttrib      gui=NONE       cterm=NONE       guifg=#F2F2F2  guibg=NONE     ctermfg=8     ctermbg=NONE
+hi      ColorColumn    gui=NONE       guifg=NONE     guibg=#000000
+hi      Conceal        gui=NONE       guifg=#808080  guibg=NONE
+hi      Directory      gui=NONE       guifg=#F2F2F2  guibg=NONE
+hi      Error          gui=NONE       guifg=NONE     guibg=#8C3346
+hi      ErrorMsg       gui=NONE       guifg=NONE     guibg=#8C3346
+hi      FoldColumn     gui=NONE       guifg=#616161  guibg=NONE
+hi      Folded         gui=NONE       guifg=#707070  guibg=NONE
+hi      Ignore         gui=NONE       guifg=NONE     guibg=NONE
+hi      ModeMsg        gui=NONE       guifg=NONE     guibg=NONE
+hi      MoreMsg        gui=NONE       guifg=NONE     guibg=NONE
+hi      Question       gui=NONE       guifg=NONE     guibg=NONE
+hi      SignColumn     gui=NONE       guifg=#616161  guibg=NONE
+hi      Underlined     gui=NONE       guifg=NONE     guibg=NONE
+hi      WarningMsg     gui=NONE       guifg=NONE     guibg=#260808
+hi      WildMenu       gui=NONE       guifg=NONE     guibg=#525252
+hi      lCursor        gui=NONE       guifg=NONE     guibg=NONE
+hi      PreProc        gui=NONE       guifg=NONE     guibg=NONE
 
-hi      ColorColumn    gui=NONE       cterm=NONE       guifg=NONE     guibg=#000000
-hi      Conceal        gui=NONE       cterm=NONE       guifg=#808080  guibg=NONE
-hi      Directory      gui=NONE       cterm=NONE       guifg=#F2F2F2  guibg=NONE     ctermfg=8
-hi      Error          gui=NONE       cterm=NONE       guifg=NONE     guibg=#8C3346  ctermfg=NONE  ctermbg=1
-hi      ErrorMsg       gui=NONE       cterm=NONE       guifg=NONE     guibg=#8C3346  ctermfg=NONE  ctermbg=1
-hi      FoldColumn     gui=NONE       cterm=NONE       guifg=#616161  guibg=NONE
-hi      Folded         gui=NONE       cterm=NONE       guifg=#707070  guibg=NONE
-hi      Ignore         gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      ModeMsg        gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      MoreMsg        gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      Question       gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      SignColumn     gui=NONE       cterm=NONE       guifg=#616161  guibg=NONE
-hi      Underlined     gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      WarningMsg     gui=NONE       cterm=NONE       guifg=NONE     guibg=#260808
-hi      WildMenu       gui=NONE       cterm=NONE       guifg=NONE     guibg=#525252
-hi      lCursor        gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      PreProc        gui=NONE       cterm=NONE       guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
+hi      SpellBad       gui=undercurl  guifg=NONE     guibg=#260808
+hi      SpellCap       gui=undercurl  guifg=NONE     guibg=NONE
+hi      SpellLocal     gui=undercurl  guifg=NONE     guibg=#082608
+hi      SpellRare      gui=undercurl  guifg=NONE     guibg=#262626
 
-hi      SpellBad       gui=undercurl  cterm=undercurl  guifg=NONE     guibg=#260808  ctermfg=NONE
-hi      SpellCap       gui=undercurl  cterm=undercurl  guifg=NONE     guibg=NONE     ctermfg=NONE  ctermbg=NONE
-hi      SpellLocal     gui=undercurl  cterm=undercurl  guifg=NONE     guibg=#082608  ctermfg=NONE
-hi      SpellRare      gui=undercurl  cterm=undercurl  guifg=NONE     guibg=#262626  ctermfg=NONE
+hi      xmlTagName     gui=NONE       guifg=#F2F2F2  guibg=NONE
+hi      xmlEndTag      gui=NONE       guifg=#F2F2F2  guibg=NONE
+hi      xmlNamespace   gui=bold       guifg=#F2F2F2  guibg=NONE
+hi      xmlAttrib      gui=NONE       guifg=#F2F2F2  guibg=NONE
+
+hi      vimwikiLink    gui=underline  guifg=#aadb0f  guibg=NONE
diff --git a/vim/.vimrc b/vim/.vimrc
index 18f6036..2fe410b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,9 +6,12 @@ set encoding=utf-8
 set showcmd
 set nocompatible
 set number
-set background=dark
 set lazyredraw
 set ttyfast
+set mouse=a
+set background=dark
+
+colorscheme akr
 
 set directory=~/.vim/swap//,.
 
@@ -23,7 +26,9 @@ set incsearch
 set ignorecase
 set smartcase
 
-colorscheme akr
+map <leader>s :let @/=""<CR>
+autocmd InsertEnter * :setlocal nohlsearch
+autocmd InsertLeave * :setlocal hlsearch
 
 vnoremap cc "+y
 nnoremap cc "+p