Skip to content

Commit

Permalink
fix: rely on omz for styling
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Buchleitner <mbuchleitner@infralovers.com>
  • Loading branch information
mabunixda committed Jan 24, 2025
1 parent 8c17d6e commit e1784a5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 149 deletions.
146 changes: 0 additions & 146 deletions .prompt
Original file line number Diff line number Diff line change
@@ -1,147 +1 @@

# Shell prompt based on the Solarized Dark theme.
# Screenshot: http://i.imgur.com/EkEtphC.png
# Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
# vim: set filetype=sh :

if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
export TERM='gnome-256color';
elif infocmp xterm-256color >/dev/null 2>&1; then
export TERM='xterm-256color';
fi;

prompt_git() {
local s='';
local branchName='';

# Check if the current directory is in a Git repository.
if [ "$(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}")" != '0' ]; then
return;
fi
# check if the current directory is in .git before running git checks
if [[ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == "false" ]]; then

if [[ -O "$(git rev-parse --show-toplevel)/.git/index" ]]; then
git update-index --really-refresh -q &> /dev/null;
fi;

# Check for uncommitted changes in the index.
if ! git diff --quiet --ignore-submodules --cached; then
s+='+';
fi;

# Check for unstaged changes.
if ! git diff-files --quiet --ignore-submodules --; then
s+='!';
fi;

# Check for untracked files.
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
s+='?';
fi;

# Check for stashed files.
if git rev-parse --verify refs/stash &>/dev/null; then
s+='$';
fi;

fi;

# Get the short symbolic ref.
# If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
# Otherwise, just give up.
branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
git rev-parse --short HEAD 2> /dev/null || \
echo '(unknown)')";

[ -n "${s}" ] && s=" [${s}]";

echo -e "${1}${branchName}${blue}${s}";
}

cloud=""
if [[ "$OSTYPE" != "darwin"* ]]; then
if grep -q "^flags.* hypervisor" /proc/cpuinfo ; then
cloud="☁️ "
fi
fi

if tput setaf 1 &> /dev/null; then
tput sgr0; # reset colors
bold=$(tput bold);
reset=$(tput sgr0);
# Solarized colors, taken from http://git.io/solarized-colors.
black=$(tput setaf 0);
blue=$(tput setaf 33);
cyan=$(tput setaf 37);
green=$(tput setaf 64);
orange=$(tput setaf 166);
purple=$(tput setaf 125);
red=$(tput setaf 124);
violet=$(tput setaf 61);
white=$(tput setaf 15);
yellow=$(tput setaf 136);
else
bold='';
reset="\e[0m";
# shellcheck disable=SC2034
black="\e[1;30m";
blue="\e[1;34m";
cyan="\e[1;36m";
green="\e[1;32m";
# shellcheck disable=SC2034
orange="\e[1;33m";
# shellcheck disable=SC2034
purple="\e[1;35m";
red="\e[1;31m";
violet="\e[1;35m";
white="\e[1;37m";
yellow="\e[1;33m";
fi;

# Highlight the user name when logged in as root.
if [[ "${USER}" == "root" ]]; then
userStyle="${red}";
else
userStyle="${blue}";
fi;

# Highlight the hostname when connected via SSH.
if [[ "${SSH_TTY}" ]]; then
hostStyle="${bold}${cyan}";
else
hostStyle="${cyan}";
fi;

if [ -n "$BASH_VERSION" ]; then

# Set the terminal title to the current working directory.
PS1="\[\033]0;\w\007\]";
# PS1+="\[${bold}\]\n"; # newline
PS1+="\[${userStyle}\]\u"; # username
PS1+="\[${white}\] at ";
PS1+="\[${hostStyle}\]${cloud}\h"; # host
PS1+="\[${white}\] in ";
PS1+="\[${green}\]\w"; # working directory
PS1+="\$(prompt_git \"${white} on ${violet}\")"; # Git repository details
PS1+="\n";
PS1+="\[${white}\]\$ \[${reset}\]"; # `$` (and reset color)
export PS1;
PS2="\[${yellow}\]→ \[${reset}\]";
export PS2;

fi

if [ -n "$ZSH_VERSION" ]; then
PS1="${userStyle}%n"
PS1+="${white} at "
PS1+="${hostStyle}${cloud}%m"
PS1+="${white} in "
PS1+="${green} %~"
PS1+="\$(prompt_git \"${white} on ${violet}\")" # Git repository details
PS1+="${NEWLINE}";
PS1+="${white}\$ ${reset}"; # `$` (and reset color)

fi

4 changes: 1 addition & 3 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
export ZSH="$HOME/.oh-my-zsh"

ZSH_THEME="robbyrussell"
ZSH_THEME="awesomepanda"
# DISABLE_AUTO_UPDATE="true"
# DISABLE_UPDATE_PROMPT="true"

plugins=(git
ansible
docker
golang
iterm2
kitchen
knife
bundler
gem
kubectl
macos
terraform
tmux
ubuntu
)

Expand Down

0 comments on commit e1784a5

Please sign in to comment.