linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

n3tpunk edit

Browse source
This commit is contained in:
Marin Marusic 2013-10-22 11:58:13 +02:00
commit 532b6a867a
2 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

27
themes/netpunk.zsh-theme
View file

@ -2,8 +2,11 @@
# Developed by NETPUNK#, software services
# http://www.netpunk.net (not up ATM)
#
<<<<<<< HEAD
# Depends on rbenv/rvm, git, mercurial and battery plugins
#
=======
>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
# License: MIT
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
@ -15,13 +18,33 @@
# THE SOFTWARE.
##
<<<<<<< HEAD
=======
>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
function prompt_char {
git branch >/dev/null 2>/dev/null && echo 'GIT ☢ ↪' && return
hg root >/dev/null 2>/dev/null && echo 'HG ☢ ↪' && return
echo ' ☢ ↪'
}
<<<<<<< HEAD
=======
function battery_charge {
if [ -e /usr/local/bin/batcharge.py ]
then
echo `python /usr/local/bin/batcharge.py`
else
echo '';
fi
}
function hg_prompt_info {
if [ $(in_hg) ]; then
hg prompt "{rev}:{node|short} on {root|basename}/{branch} {task} {status} {update} {patch|count|unapplied} {incoming changes{incoming|count}} " 2>/dev/null
fi
}
>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
if which rvm-prompt &> /dev/null; then
PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%} %~ %{$reset_color%}$(hg_prompt_info)$(git_prompt_info)%{$reset_color%}
$(prompt_char) '
@ -29,7 +52,11 @@ if which rvm-prompt &> /dev/null; then
elif which rbenv &> /dev/null; then
PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%} %~ %{$reset_color%}$(hg_prompt_info)$(git_prompt_info)%{$reset_color%}
$(prompt_char) '
<<<<<<< HEAD
RPROMPT='%{$fg[red]%}RB $(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} $(battery_pct_prompt)'
=======
RPROMPT='%{$fg[red]%}RB $(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} %{$fg[green]%} BAT: %{$reset_color%} $(battery_charge)'
>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
fi