From aaa525912eb1abeda82f82dc3e4f744b4801f0c1 Mon Sep 17 00:00:00 2001 From: Meutel Date: Fri, 20 May 2016 19:43:25 +0200 Subject: [PATCH 1/2] Git prompt linux --- _bashrc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/_bashrc b/_bashrc index e8f1f9f..91372e7 100644 --- a/_bashrc +++ b/_bashrc @@ -106,8 +106,13 @@ fi if [ -e /usr/local/share/git-core/contrib/completion/git-completion.bash ]; then . /usr/local/share/git-core/contrib/completion/git-completion.bash fi -if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ]; then - . /usr/local/share/git-core/contrib/completion/git-prompt.sh +if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ] || [ -e /usr/lib/git-core/git-sh-prompt ]; then + if [ -e /usr/lib/git-core/git-sh-prompt ]; then + . /usr/lib/git-core/git-sh-prompt + fi + if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ]; then + . /usr/local/share/git-core/contrib/completion/git-prompt.sh + fi export GIT_PS1_SHOWDIRTYSTATE=1 export GIT_PS1_SHOWSTASHSTATE=1 export GIT_PS1_SHOWUNTRACKEDFILES=1 From cd0d259c95ef54719ffe2061de3c67fd63459b1d Mon Sep 17 00:00:00 2001 From: Meutel Date: Sun, 22 May 2016 10:29:52 +0200 Subject: [PATCH 2/2] vim: fix buffers navigation --- _vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_vimrc b/_vimrc index 0f8842f..cc8afb4 100644 --- a/_vimrc +++ b/_vimrc @@ -100,8 +100,8 @@ nnoremap w :w " quit nnoremap q :q " navigate buffers -nnoremap h :bn -nnoremap l :bp +nnoremap l :bn +nnoremap h :bp " copy/paste system clipboard vmap y "+y vmap d "+d