Various updates

This commit is contained in:
Rob Watson 2021-04-13 17:59:03 +02:00
parent 4e013d1985
commit 6ecad00f9c
3 changed files with 9 additions and 0 deletions

View File

@ -18,6 +18,8 @@
fixup = rebase -i --autosquash fixup = rebase -i --autosquash
mr = !git merge $(git rb) mr = !git merge $(git rb)
nuke = reset --hard nuke = reset --hard
p = push
poh = push -u origin HEAD
pl = pull pl = pull
plr = pull --rebase plr = pull --rebase
pr = diff origin/master pr = diff origin/master

View File

@ -17,4 +17,6 @@ tmux new -d -s $sessionname
tmux rename-window -t $sessionname:1 cli tmux rename-window -t $sessionname:1 cli
tmux new-window -t $sessionname -n vim vim tmux new-window -t $sessionname -n vim vim
tmux select-window -t $sessionname:1 tmux select-window -t $sessionname:1
# https://github.com/tmux/tmux/issues/2064
sleep 0.5
tmux attach -t $sessionname tmux attach -t $sessionname

5
vimrc
View File

@ -162,6 +162,8 @@ nnoremap <leader>ah :GitGutterLineHighlightsToggle<cr>
nnoremap <leader>aY :call CopyGitURLToLineOrRange()<cr> nnoremap <leader>aY :call CopyGitURLToLineOrRange()<cr>
nnoremap <leader>ao :call OpenGitURLToLineOrRange()<cr> nnoremap <leader>ao :call OpenGitURLToLineOrRange()<cr>
" echo filename of current buffer:
nmap <leader>fe :echom expand("%:p")<cr>
" yank filename of current buffer: " yank filename of current buffer:
function! CopyToDefaultRegister() function! CopyToDefaultRegister()
let @" = expand("%:p") let @" = expand("%:p")
@ -179,6 +181,9 @@ nmap <leader>fY :call CopyToSystemClipboard()<cr>
" ctrl-v to paste from system clipboard in insert mode: " ctrl-v to paste from system clipboard in insert mode:
inoremap <c-v> <esc>"*Pa inoremap <c-v> <esc>"*Pa
" disable Ex mode
nnoremap Q <Nop>
function! ToggleQuickFix() function! ToggleQuickFix()
if empty(filter(getwininfo(), 'v:val.quickfix')) if empty(filter(getwininfo(), 'v:val.quickfix'))
copen copen