From 8e53e2e5a1e2fb538a9e578b13f3389543b01e6b Mon Sep 17 00:00:00 2001 From: Marin Marusic Date: Sun, 29 Sep 2013 13:36:44 +0200 Subject: [PATCH] =?UTF-8?q?done=20a=20bit=20of=20refactoring,=20moved=20ou?= =?UTF-8?q?t=20some=20stuff=20I=20don't=20need=20like=20virtual=5Fenv=20ch?= =?UTF-8?q?ecks=20and=20so=20on.=20Also=20put=20up=20a=20header=20and=20li?= =?UTF-8?q?cense=20(MIT)=20=E2=80=A6=20'tis=20changeable=20to=20=20whateve?= =?UTF-8?q?r=20as=20long=20as=20it's=20free=20to=20use/modify/redistribute?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/netpunk.zsh-theme | 41 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/themes/netpunk.zsh-theme b/themes/netpunk.zsh-theme index fb985a83a..3b42d8714 100644 --- a/themes/netpunk.zsh-theme +++ b/themes/netpunk.zsh-theme @@ -1,9 +1,24 @@ +## +# Developed by NETPUNK#, software services +# http://www.netpunk.net (not up ATM) +# +# License: MIT +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +## + function prompt_char { git branch >/dev/null 2>/dev/null && echo 'GIT ☢ ↪' && return hg root >/dev/null 2>/dev/null && echo 'HG ☢ ↪' && return - echo ' ☣ ↪' + echo ' ☢ ↪' } -function battery_charge() { +function battery_charge { if [ -e /usr/local/bin/batcharge.py ] then echo `python /usr/local/bin/batcharge.py` @@ -18,33 +33,13 @@ function hg_prompt_info { fi } -function get_pwd() { - echo "${PWD/$HOME/~}" -} - -function virtualenv_info { - [ $VIRTUAL_ENV ] && echo '('on `basename $VIRTUAL_ENV`') ' -} -function spacing { - local spacing="" - for i in {1..$termwidth}; do - spacing="${spacing} " - done - echo $spacing -} -function collapse_pwd { - echo $(pwd | sed -e "s,^$HOME,~,") -} - if 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) ' - RPROMPT='using %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}$(virtualenv_info) %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} BAT: $(battery_charge)' + RPROMPT='using %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} BAT: $(battery_charge)' fi - - ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%} " ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[white]%}%{$bg[red]%} ✖ "