diff --git a/themes/vissi.zsh-theme b/themes/vissi.zsh-theme new file mode 100644 index 000000000..cd657e3ca --- /dev/null +++ b/themes/vissi.zsh-theme @@ -0,0 +1,25 @@ +function battery_charge { + # Battery 0: Discharging, 94%, 03:46:34 remaining + bat_percent=`acpi | awk -F ':' {'print $2;'} | awk -F ',' {'print $2;'} | sed -e "s/\s//" -e "s/%.*//"` + + if [ $bat_percent -lt 20 ]; then cl='%F{red}' + elif [ $bat_percent -lt 50 ]; then cl='%F{yellow}' + else cl='%F{green}' + fi + + filled=${(l:`expr $bat_percent / 10`::▸:)} + empty=${(l:`expr 10 - $bat_percent / 10`::▹:)} + echo $cl$filled$empty'%F{default}' +} + +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +if [ -x /usr/bin/acpi ]; then + RPROMPT="%T %D $(battery_charge)" +else + RPROMPT="%T %D" +fi + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/tools/install.sh b/tools/install.sh index b080be3a1..891265d9e 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,28 +1,24 @@ -if [ -d ~/.oh-my-zsh ] +if [ -d $HOME/.oh-my-zsh ] then - echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install" + echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $HOME/.oh-my-zsh if you want to install" exit fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || { - echo "git not installed" - exit -} echo "\033[0;34mLooking for an existing zsh config...\033[0m" -if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] +if [ -f $HOME/.zshrc ] || [ -h $HOME/.zshrc ] then - echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m"; - cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh; - rm ~/.zshrc; + echo "\033[0;33mFound $HOME/.zshrc.\033[0m \033[0;32mBacking up to $HOME/.zshrc.pre-oh-my-zsh\033[0m"; + cp $HOME/.zshrc $HOME/.zshrc.pre-oh-my-zsh; + rm $HOME/.zshrc; fi -echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" -cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc +echo "\033[0;34mUsing the Oh My Zsh template file and adding it to $HOME/.zshrc\033[0m" +cp $HOME/.oh-my-zsh/templates/zshrc.zsh-template $HOME/.zshrc -echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" -echo "export PATH=$PATH" >> ~/.zshrc +echo "\033[0;34mCopying your current PATH and adding it to the end of $HOME/.zshrc for you.\033[0m" +echo "export PATH=$PATH" >> $HOME/.zshrc echo "\033[0;34mTime to change your default shell to zsh!\033[0m" chsh -s `which zsh` @@ -36,4 +32,5 @@ echo "\033[0;32m"' /____/ '"\033[0m echo "\n\n \033[0;32m....is now installed.\033[0m" /usr/bin/env zsh -source ~/.zshrc +touch ~/.zshrc +source $HOME/.zshrc