Updated neovim config

master
Jef Roosens 2021-04-22 10:45:36 +02:00
parent c49e775514
commit 300dd871b9
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
3 changed files with 17 additions and 7 deletions

View File

@ -8,6 +8,7 @@
# =====ENVIRONMENT VARIABLES=====
export EDITOR=nvim
export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
export INPUTRC="$HOME/.inputrc"
# =====FUNCTIONS=====

View File

@ -40,15 +40,20 @@ vnoremap <Up> <nop>
vnoremap <Down> <nop>
" Tabs bindings
" TODO improve on these
" Create tab
nnoremap <silent> <leader>ee :tabnew<CR>
" Create tab at the end of the list
nnoremap <silent> <leader>ee :$tabnew<CR>
" Create tab after current tab
nnoremap <silent> <leader>eL :tabnew<CR>
" Create tab before current one
nnoremap <silent> <leader>eH :-tabnew<CR>
" Close current tab
nnoremap <silent> <leader>ed :tabclose<CR>
" Go to next tab
nnoremap <silent> <leader>el :tabnext<CR>
" Go to previous tab
nnoremap <silent> <leader>eh :tabprevious<CR>
" Open new tab with terminal, and switch to insert mode
nnoremap <silent> <leader>er :tabnew<CR>:e term://$SHELL<CR>i
" This function allows me to switch between a dark & light theme. I mainly use
" the dark theme, but when I'm sitting outside, the light theme can be much

View File

@ -5,8 +5,12 @@ nnoremap <silent> <leader>gg :Git<CR>
nnoremap <silent> <leader>gc :Git commit<CR>
" Push
nnoremap <silent> <leader>gp :Git push<CR>
" Show diffs
nnoremap <silent> <leader>gd :Gvdiffsplit!<CR>
" Open diff tool
nnoremap <silent> <leader>gd :Gdiffsplit!<CR>
" Open merge tool
nnoremap <silent> <leader>gm :Git mergetool<CR>
" Easily resolve merges
nnoremap <silent> <leader>gh :diffget //2<CR>
nnoremap <silent> <leader>gl :diffget //3<CR>
" nnoremap <silent> <leader>gh :diffget //2<CR>
" nnoremap <silent> <leader>gl :diffget //3<CR>
" Git blame
nnoremap <silent> <leader>gb :Git blame<CR>