Minor vim config updates

nvim/config.vim

@@ -46,10 +46,12 @@ set visualbell
 set wildmode=list:longest,list:full
 set wrapscan
 
-filetype plugin indent on
-syntax on
+" default language utf-8
+language en_US.UTF-8
 
 " deactivate syntax highlighting when diffing
+filetype plugin indent on
+syntax on
 if &diff
   syntax off
 endif
@@ -59,4 +61,3 @@ let g:hybrid_reduced_contrast=0
 let g:hybrid_custom_term_colors=1
 set background=dark
 colorscheme hybrid
-

nvim/init.vim

@@ -1,9 +1,7 @@
-language en_US.UTF-8
-set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim
-
-" let dein handle all the plugins and bundles
-call dein#begin(expand('~/.config/nvim/dein'))
-  call dein#add('shougo/dein.vim')
+set runtimepath+=~/.cache/dein/repos/github.com/Shougo/dein.vim
+if dein#load_state('~/.cache/dein')
+  call dein#begin('~/.cache/dein')
+  call dein#add('~/.cache/dein/repos/github.com/Shougo/dein.vim')
 
   call dein#add('christoomey/vim-tmux-navigator')
   call dein#add('easymotion/vim-easymotion')
@@ -13,9 +11,11 @@ call dein#begin(expand('~/.config/nvim/dein'))
   call dein#add('junegunn/gv.vim')
   call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' })
   call dein#add('sheerun/vim-polyglot')
+  call dein#add('tpope/vim-apathy')
   call dein#add('tpope/vim-commentary')
   call dein#add('tpope/vim-eunuch')
   call dein#add('tpope/vim-fugitive')
+  call dein#add('tpope/vim-obsession')
   call dein#add('tpope/vim-ragtag')
   call dein#add('tpope/vim-repeat')
   call dein#add('tpope/vim-surround')
@@ -25,7 +25,10 @@ call dein#begin(expand('~/.config/nvim/dein'))
   call dein#add('wellle/targets.vim')
   call dein#add('wellle/tmux-complete.vim')
   call dein#add('wincent/terminus')
-call dein#end()
+
+  call dein#end()
+  call dein#save_state()
+endif
 
 " load the default config and mappings
 source ~/.config/nvim/config.vim

nvim/plugins.vim

@@ -15,8 +15,7 @@ nnoremap <silent> <space>h :History:<cr>
 " EasyMotion
 let g:EasyMotion_do_mapping=0
 let g:EasyMotion_smartcase=1
-nmap <leader>s <Plug>(easymotion-overwin-f)
-nmap <leader>S <Plug>(easymotion-overwin-f2)
+nmap <leader>j <Plug>(easymotion-overwin-f2)
 
 " COC.vim
 inoremap <silent><expr> <C-j>