From f9fdcd4b167e2738cd191dc064c3c9085e92f0df Mon Sep 17 00:00:00 2001 From: fbt Date: Thu, 9 Nov 2017 15:26:42 +0300 Subject: [PATCH] is_git_repo and rvm stuff Signed-off-by: fbt --- homedir/.config/watchman/init.d/scron | 2 +- homedir/.config/zsh.d/modules/config | 4 ++-- homedir/.config/zsh.d/modules/prompt | 16 +++++++++++++++- homedir/.vimperatorrc.local | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/homedir/.config/watchman/init.d/scron b/homedir/.config/watchman/init.d/scron index f9b8bd6..db786dd 100755 --- a/homedir/.config/watchman/init.d/scron +++ b/homedir/.config/watchman/init.d/scron @@ -1,4 +1,4 @@ -#!/usr/bin/env watchman +#!/usr/bin/env ssm service_respawn='true' service_command='/usr/bin/crond' diff --git a/homedir/.config/zsh.d/modules/config b/homedir/.config/zsh.d/modules/config index 4cd50c0..850aad9 100644 --- a/homedir/.config/zsh.d/modules/config +++ b/homedir/.config/zsh.d/modules/config @@ -40,11 +40,11 @@ dotfiles_dir="$HOME/git/dotfiles" # PATH set_misc_path \ "$HOME/.config/alternatives" \ - "$HOME/.rvm/bin" \ "$HOME/games/bin" \ "$HOME/.local/bin" \ "$HOME/.nails/bin" \ - "$HOME/.winepx/bin" + "$HOME/.winepx/bin" \ + "$HOME/.rvm/bin" # GPG GPG_TTY=$(tty) diff --git a/homedir/.config/zsh.d/modules/prompt b/homedir/.config/zsh.d/modules/prompt index 18a6ac0..5932502 100644 --- a/homedir/.config/zsh.d/modules/prompt +++ b/homedir/.config/zsh.d/modules/prompt @@ -44,6 +44,20 @@ precmd.svn() { fi } +precmd.is_git_repo() { + declare _pwd=$PWD + + while [[ -n $_pwd ]]; do + if [[ -r "$_pwd/.git/HEAD" ]]; then + return 0 + else + _pwd=${pwd%/*} + fi + done + + return 1 +} + precmd.git() { declare git_unstaged git_untracked git_status_short git_status_colour git_prompt_msg @@ -51,7 +65,7 @@ precmd.git() { return 0 fi - if git rev-parse --git-dir &>/dev/null; then + if precmd.is_git_repo; then git_current_branch=$(git rev-parse --abbrev-ref HEAD) while IFS= read -r line; do diff --git a/homedir/.vimperatorrc.local b/homedir/.vimperatorrc.local index 27611c9..26617b9 100644 --- a/homedir/.vimperatorrc.local +++ b/homedir/.vimperatorrc.local @@ -1,6 +1,6 @@ :set gui=nonavigation :set autocomplete=false -:map O :tabopen! +:map O :tabopen :map P :set apptab :map D :tabclose!