From fa7b51b86afdb9ea5cacb81b63c059f21f94bec1 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Thu, 24 Nov 2022 15:07:30 -0500 Subject: [PATCH] [+] git-id --- scripts/includes/prompt.sh | 43 ++++++++++++++++++++------------------ scripts/zshrc.sh | 20 ++++++++++++++++++ 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/scripts/includes/prompt.sh b/scripts/includes/prompt.sh index a343274..9256adf 100755 --- a/scripts/includes/prompt.sh +++ b/scripts/includes/prompt.sh @@ -19,23 +19,26 @@ pcolor() { prompt "$tmp" color } -########### Build a zsh prompt -# New line first -prompt-set 0 "&n" -# Time stamp -prompt-set 10 "&5%D{%a %m-%d %H:%M}&r " -[[ "$HOST" != "HyDEV" ]] && prompt-set 10 "&gf(#55CDFC)%D{%a} &gf(#F7A8B8)%D{%m-}&f%D{%d} &gf(#F7A8B8)%D{%H:}&gf(#55CDFC)%D{%M}&r " -# Hostname -prompt-set 20 "&1%m&r " -[[ "$HOST" == "HyDEV" ]] && prompt-set 20 "&gf(#55CDFC)H&gf(#F7A8B8)y&fD&gf(#F7A8B8)E&gf(#55CDFC)V&r " -# Username, or show a cat if I'm hykilpikonna -prompt-set 30 "&e%n&r " -[[ "$USER" == "hykilpikonna" ]] && prompt-set 30 "🐱 " -# Directory -prompt-set 40 "&r%~ " -# New line after the prompt header -prompt-set 1000 "&n" -# Prompt before input -prompt-set 1100 "> " -# Create prompt -prompt-update +# Build a zsh prompt +prompt-reset() { + # New line first + prompt-set 0 "&n" + # Time stamp + prompt-set 10 "&5%D{%a %m-%d %H:%M}&r " + [[ "$HOST" != "HyDEV" ]] && prompt-set 10 "&gf(#55CDFC)%D{%a} &gf(#F7A8B8)%D{%m-}&f%D{%d} &gf(#F7A8B8)%D{%H:}&gf(#55CDFC)%D{%M}&r " + # Hostname + prompt-set 20 "&1%m&r " + [[ "$HOST" == "HyDEV" ]] && prompt-set 20 "&gf(#55CDFC)H&gf(#F7A8B8)y&fD&gf(#F7A8B8)E&gf(#55CDFC)V&r " + # Username, or show a cat if I'm hykilpikonna + prompt-set 30 "&e%n&r " + [[ "$USER" == "hykilpikonna" ]] && prompt-set 30 "🐱 " + # Directory + prompt-set 40 "&r%~ " + # New line after the prompt header + prompt-set 1000 "&n" + # Prompt before input + prompt-set 1100 "> " + # Create prompt + prompt-update +} +prompt-reset \ No newline at end of file diff --git a/scripts/zshrc.sh b/scripts/zshrc.sh index f3c54fe..d85cc46 100755 --- a/scripts/zshrc.sh +++ b/scripts/zshrc.sh @@ -211,6 +211,26 @@ setproxy() { prompt-update } +# Git identity +git-id() { + export GIT_USER="$1" + export GIT_EMAIL="$2" + git-id-prompt +} +git-id-prompt() { + if [[ -z "$GIT_USER" ]] && [[ -z "$GIT_EMAIL" ]]; then + prompt-reset + else + prompt-set 30 "&cGit ID: $GIT_USER | $GIT_EMAIL " + prompt-update + fi +} +git-id-prompt +export GIT_BIN=$(which git) +git() { + [[ -z "$GIT_USER" ]] && $GIT_BIN "$@" || $GIT_BIN -c "user.name=$GIT_USER" -c "user.email=$GIT_EMAIL" "$@" +} + # Mac hostname mac-hostname() { name="$@"