Compare commits

...

7 Commits

Author SHA1 Message Date
Ray Elliott fb0667c649 unset VIMRUNTIME before launching st 2020-04-07 17:17:21 +01:00
Ray Elliott 8c98009e27 remove bspc commands 2020-04-07 17:15:21 +01:00
Ray Elliott 744ead7003 add tig and ranger launcher mappings 2020-04-07 16:34:16 +01:00
Ray Elliott b3a89a397d get rid of terminal ESC remapping 2020-04-07 16:25:55 +01:00
Ray Elliott eb9c48eea5 get rid of g 2020-04-07 16:24:12 +01:00
Ray Elliott be817e5df3 update git mappings, remove fugitive references 2020-04-07 15:58:23 +01:00
Ray Elliott 4207a47802 remove fugitive
use terminal tig instead
2020-04-07 15:51:07 +01:00
2 changed files with 12 additions and 23 deletions

View File

@ -7,11 +7,11 @@ call plug#begin('~/.config/nvim/bundle')
" #vim-hexokinase {{{ " #vim-hexokinase {{{
" https://github.com/RRethy/vim-hexokinase " https://github.com/RRethy/vim-hexokinase
Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' } " Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
let g:Hexokinase_highlighters = ['virtual'] " let g:Hexokinase_highlighters = ['virtual']
let g:Hexokinase_virtualText = '██████' " let g:Hexokinase_virtualText = '██████'
nnoremap <silent> <cr>cc :HexokinaseToggle<CR> " nnoremap <silent> <cr>cc :HexokinaseToggle<CR>
nnoremap <silent> <cr>cr :HexokinaseRefresh<CR> " nnoremap <silent> <cr>cr :HexokinaseRefresh<CR>
"}}} "}}}
@ -101,17 +101,6 @@ call plug#begin('~/.config/nvim/bundle')
\ 'indentation': ' ', \ '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 {{{ " #gitgutter {{{
" https://github.com/airblade/vim-gitgutter/blob/master/README.mkd " https://github.com/airblade/vim-gitgutter/blob/master/README.mkd

View File

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