diff --git a/gitconfig b/gitconfig index 7f80629..e75ddda 100644 --- a/gitconfig +++ b/gitconfig @@ -18,6 +18,8 @@ fixup = rebase -i --autosquash mr = !git merge $(git rb) nuke = reset --hard + p = push + poh = push -u origin HEAD pl = pull plr = pull --rebase pr = diff origin/master diff --git a/script/tmuxsess b/script/tmuxsess index 172dbb1..e351c24 100755 --- a/script/tmuxsess +++ b/script/tmuxsess @@ -17,4 +17,6 @@ tmux new -d -s $sessionname tmux rename-window -t $sessionname:1 cli tmux new-window -t $sessionname -n vim vim tmux select-window -t $sessionname:1 +# https://github.com/tmux/tmux/issues/2064 +sleep 0.5 tmux attach -t $sessionname diff --git a/vimrc b/vimrc index e43fe2f..258edbb 100644 --- a/vimrc +++ b/vimrc @@ -162,6 +162,8 @@ nnoremap ah :GitGutterLineHighlightsToggle nnoremap aY :call CopyGitURLToLineOrRange() nnoremap ao :call OpenGitURLToLineOrRange() +" echo filename of current buffer: +nmap fe :echom expand("%:p") " yank filename of current buffer: function! CopyToDefaultRegister() let @" = expand("%:p") @@ -179,6 +181,9 @@ nmap fY :call CopyToSystemClipboard() " ctrl-v to paste from system clipboard in insert mode: inoremap "*Pa +" disable Ex mode +nnoremap Q + function! ToggleQuickFix() if empty(filter(getwininfo(), 'v:val.quickfix')) copen