From 4207a478028ac620d0e04c31b6ac909be66c1380 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 15:51:07 +0100 Subject: [PATCH 1/7] remove fugitive use terminal tig instead --- init.plugins.vim | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/init.plugins.vim b/init.plugins.vim index 5290d20..68fd8eb 100644 --- a/init.plugins.vim +++ b/init.plugins.vim @@ -101,17 +101,6 @@ call plug#begin('~/.config/nvim/bundle') \ 'indentation': ' ', \} - "}}} -" #vim-fugitive{{{ - " https://github.com/tpope/vim-fugitive/blob/master/README.markdown - Plug 'tpope/vim-fugitive' - nnoremap gs :Gstatus - nnoremap gd :tabedit %:Gdiff - nnoremap gc :Gcommit - nnoremap gl :Glog - nnoremap gp :Gpush:copen - nnoremap gp :Gpushjob:copen - "}}} " #gitgutter {{{ " https://github.com/airblade/vim-gitgutter/blob/master/README.mkd From be817e5df3808b96ccfc6b6101cd2abdd1712bd3 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 15:58:23 +0100 Subject: [PATCH 2/7] update git mappings, remove fugitive references --- init.vim | 3 --- 1 file changed, 3 deletions(-) diff --git a/init.vim b/init.vim index 2e56579..15ff19d 100644 --- a/init.vim +++ b/init.vim @@ -351,12 +351,9 @@ endif " }}} " git mappings {{{ -" also see vim-fugitive plugin section nnoremap gD :!clear; echo 'git diff'; git diff nnoremap ga :!clear; git add %; git status -nnoremap gA :!clear; git add .; git status nnoremap gg :!clear; git add %; git commit -m '' -nnoremap gP :!clear; echo 'git push'; git push "}}} " movement/navigation{{{ From eb9c48eea5ec288db26ea774b284451fdb32898d Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 16:24:12 +0100 Subject: [PATCH 3/7] get rid of g --- init.plugins.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/init.plugins.vim b/init.plugins.vim index 68fd8eb..458c0d4 100644 --- a/init.plugins.vim +++ b/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 cc :HexokinaseToggle - nnoremap cr :HexokinaseRefresh + " Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' } + " let g:Hexokinase_highlighters = ['virtual'] + " let g:Hexokinase_virtualText = '██████' + " nnoremap cc :HexokinaseToggle + " nnoremap cr :HexokinaseRefresh "}}} From b3a89a397da2bed0866551136552922318a1b9a8 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 16:25:55 +0100 Subject: [PATCH 4/7] get rid of terminal ESC remapping --- init.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init.vim b/init.vim index 15ff19d..e04c2bb 100644 --- a/init.vim +++ b/init.vim @@ -342,9 +342,9 @@ nnoremap ss :syntax sync fromstart "}}} " terminal{{{ -if has('terminal') - tnoremap -endif +" if has('terminal') +" tnoremap +" endif "}}} " windows{{{ nnoremap ww :resize:vertical resize @@ -354,6 +354,7 @@ endif nnoremap gD :!clear; echo 'git diff'; git diff nnoremap ga :!clear; git add %; git status nnoremap gg :!clear; git add %; git commit -m '' +nnoremap gs :!bspc rule -a st-256color -o state=fullscreen; st tig status "}}} " movement/navigation{{{ From 744ead7003727c2aa42188789cc42189e22e62af Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 16:34:16 +0100 Subject: [PATCH 5/7] add tig and ranger launcher mappings --- init.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.vim b/init.vim index e04c2bb..9d8d756 100644 --- a/init.vim +++ b/init.vim @@ -299,8 +299,10 @@ set conceallevel=0 "----------------------------------------------------------------------------}}} " #mappings {{{ let g:mapleader = ' ' +" image capable file browser +nnoremap rs :!bspc rule -a st-256color -o state=fullscreen; st ranger " search and replace {{{ -nnoremap rr :%s/\<=expand('')\>//g +nnoremap rr :%s/\<=expand('')\>//g "}}} " #syntax nnoremap s :syntax on From 8c98009e27dfadf7805cfda8905c1e2c4aa7fe50 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 17:15:21 +0100 Subject: [PATCH 6/7] remove bspc commands --- init.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.vim b/init.vim index 9d8d756..bebe887 100644 --- a/init.vim +++ b/init.vim @@ -300,7 +300,7 @@ set conceallevel=0 " #mappings {{{ let g:mapleader = ' ' " image capable file browser -nnoremap rs :!bspc rule -a st-256color -o state=fullscreen; st ranger +nnoremap rs :!st -t WM_FORCE_FULLSCREEN ranger " search and replace {{{ nnoremap rr :%s/\<=expand('')\>//g "}}} @@ -356,7 +356,7 @@ nnoremap ss :syntax sync fromstart nnoremap gD :!clear; echo 'git diff'; git diff nnoremap ga :!clear; git add %; git status nnoremap gg :!clear; git add %; git commit -m '' -nnoremap gs :!bspc rule -a st-256color -o state=fullscreen; st tig status +nnoremap gs :!VIMRUNTIME= st -t WM_FORCE_FLOATING -g 230x62 tig status "}}} " movement/navigation{{{ From fb0667c649f49a7bc892c2f9ed4caaab23c8af8a Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 7 Apr 2020 17:17:21 +0100 Subject: [PATCH 7/7] unset VIMRUNTIME before launching st --- init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.vim b/init.vim index bebe887..531770b 100644 --- a/init.vim +++ b/init.vim @@ -300,7 +300,7 @@ set conceallevel=0 " #mappings {{{ let g:mapleader = ' ' " image capable file browser -nnoremap rs :!st -t WM_FORCE_FULLSCREEN ranger +nnoremap rs :!VIMRUNTIME= st -t WM_FORCE_FULLSCREEN ranger " search and replace {{{ nnoremap rr :%s/\<=expand('')\>//g "}}}