init.plugins.vim

@@ -7,11 +7,11 @@ call plug#begin('~/.config/nvim/bundle')
 
 "   #vim-hexokinase {{{
   " https://github.com/RRethy/vim-hexokinase
-  " Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
-  " let g:Hexokinase_highlighters = ['virtual']
-  " let g:Hexokinase_virtualText = '██████'
-  " nnoremap <silent> <cr>cc :HexokinaseToggle<CR>
-  " nnoremap <silent> <cr>cr :HexokinaseRefresh<CR>
+  Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
+  let g:Hexokinase_highlighters = ['virtual']
+  let g:Hexokinase_virtualText = '██████'
+  nnoremap <silent> <cr>cc :HexokinaseToggle<CR>
+  nnoremap <silent> <cr>cr :HexokinaseRefresh<CR>
 
   "}}}
 
@@ -101,6 +101,17 @@ call plug#begin('~/.config/nvim/bundle')
   \  'indentation': '  ',
   \}
 
+  "}}}
+"   #vim-fugitive{{{
+  " https://github.com/tpope/vim-fugitive/blob/master/README.markdown
+  Plug 'tpope/vim-fugitive'
+  nnoremap <silent> <space>gs :Gstatus<CR>
+  nnoremap <silent> <space>gd :tabedit %<CR>:Gdiff<CR>
+  nnoremap <silent> <space>gc :Gcommit<CR>
+  nnoremap <silent> <space>gl :Glog<CR>
+  nnoremap <silent> <space>gp :Gpush<CR>:copen<CR>
+  nnoremap <silent> <space>gp :Gpushjob<CR>:copen<CR>
+
   "}}}
 "   #gitgutter {{{
   " https://github.com/airblade/vim-gitgutter/blob/master/README.mkd

init.vim

@@ -299,10 +299,8 @@ set conceallevel=0
 "----------------------------------------------------------------------------}}}
 " #mappings {{{
 let g:mapleader = ' '
-" image capable file browser
-nnoremap <silent><space>rs :!VIMRUNTIME= st -t WM_FORCE_FULLSCREEN ranger<CR>
 "   search and replace {{{
-nnoremap <space>rr :%s/\<<Ckr>=expand('<cword>')<CR>\>//g<left><left>
+nnoremap <space>rr :%s/\<<C-r>=expand('<cword>')<CR>\>//g<left><left>
 "}}}
 " #syntax
 nnoremap <silent> <cr>s :syntax on<cr>
@@ -344,19 +342,21 @@ nnoremap <silent><space>ss :syntax sync fromstart<CR>
 
 "}}}
 "   terminal{{{
-" if has('terminal')
-"   tnoremap <Esc> <C-\><C-n>
-" endif
+if has('terminal')
+  tnoremap <Esc> <C-\><C-n>
+endif
 "}}}
 "   windows{{{
     nnoremap <space>ww :resize<CR>:vertical resize<CR>
 
 "   }}}
 "   git mappings {{{
+" also see vim-fugitive plugin section
 nnoremap <space>gD :!clear; echo 'git diff'; git diff<CR>
 nnoremap <space>ga :!clear; git add %; git status<CR>
+nnoremap <space>gA :!clear; git add .; git status<CR>
 nnoremap <space>gg :!clear; git add %; git commit -m ''<Left>
-nnoremap <silent><space>gs :!VIMRUNTIME= st -t WM_FORCE_FLOATING -g 230x62 tig status<CR>
+nnoremap <space>gP :!clear; echo 'git push'; git push<CR>
 
 "}}}
 "   movement/navigation{{{