From 6ecad00f9c7e765d28dd6bd1a2f219acde847399 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Tue, 13 Apr 2021 17:59:03 +0200
Subject: [PATCH] Various updates

---
 gitconfig       | 2 ++
 script/tmuxsess | 2 ++
 vimrc           | 5 +++++
 3 files changed, 9 insertions(+)

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