Updated neovim config
parent
c49e775514
commit
300dd871b9
1
.bashrc
1
.bashrc
|
@ -8,6 +8,7 @@
|
||||||
# =====ENVIRONMENT VARIABLES=====
|
# =====ENVIRONMENT VARIABLES=====
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
|
export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
|
||||||
|
export INPUTRC="$HOME/.inputrc"
|
||||||
|
|
||||||
|
|
||||||
# =====FUNCTIONS=====
|
# =====FUNCTIONS=====
|
||||||
|
|
|
@ -40,15 +40,20 @@ vnoremap <Up> <nop>
|
||||||
vnoremap <Down> <nop>
|
vnoremap <Down> <nop>
|
||||||
|
|
||||||
" Tabs bindings
|
" Tabs bindings
|
||||||
" TODO improve on these
|
" Create tab at the end of the list
|
||||||
" Create tab
|
nnoremap <silent> <leader>ee :$tabnew<CR>
|
||||||
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
|
" Close current tab
|
||||||
nnoremap <silent> <leader>ed :tabclose<CR>
|
nnoremap <silent> <leader>ed :tabclose<CR>
|
||||||
" Go to next tab
|
" Go to next tab
|
||||||
nnoremap <silent> <leader>el :tabnext<CR>
|
nnoremap <silent> <leader>el :tabnext<CR>
|
||||||
" Go to previous tab
|
" Go to previous tab
|
||||||
nnoremap <silent> <leader>eh :tabprevious<CR>
|
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
|
" 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
|
" the dark theme, but when I'm sitting outside, the light theme can be much
|
||||||
|
|
|
@ -5,8 +5,12 @@ nnoremap <silent> <leader>gg :Git<CR>
|
||||||
nnoremap <silent> <leader>gc :Git commit<CR>
|
nnoremap <silent> <leader>gc :Git commit<CR>
|
||||||
" Push
|
" Push
|
||||||
nnoremap <silent> <leader>gp :Git push<CR>
|
nnoremap <silent> <leader>gp :Git push<CR>
|
||||||
" Show diffs
|
" Open diff tool
|
||||||
nnoremap <silent> <leader>gd :Gvdiffsplit!<CR>
|
nnoremap <silent> <leader>gd :Gdiffsplit!<CR>
|
||||||
|
" Open merge tool
|
||||||
|
nnoremap <silent> <leader>gm :Git mergetool<CR>
|
||||||
" Easily resolve merges
|
" Easily resolve merges
|
||||||
nnoremap <silent> <leader>gh :diffget //2<CR>
|
" nnoremap <silent> <leader>gh :diffget //2<CR>
|
||||||
nnoremap <silent> <leader>gl :diffget //3<CR>
|
" nnoremap <silent> <leader>gl :diffget //3<CR>
|
||||||
|
" Git blame
|
||||||
|
nnoremap <silent> <leader>gb :Git blame<CR>
|
||||||
|
|
Loading…
Reference in New Issue