From a3f7d31c500f03a55e860340871890c2dfc762d9 Mon Sep 17 00:00:00 2001 From: CramMK Date: Wed, 5 Feb 2020 16:49:31 +0100 Subject: [PATCH] Fix OBSD zsh theme temporarily use legacy 'marc-theme' --- README.md | 4 +++- config.yaml | 10 ++++++++-- dotfiles/zsh/marc-pygmalion.zsh-theme | 6 +++--- dotfiles/zshrc | 5 +++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 72742e6..2cc5c6b 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ My personal dotfiles/ configurations, managed with the 'dotdrop' submodule Currently using: + `OneDark` Colortheme with `lightline` Statusbar for vim -+ `Inconsolata` Font from google for Xterm ++ `Inconsolata` Powerline Patched Font for Xterm ++ A modded `Agnoster` ZSH-Theme +Outdated picture: ![bash](https://i.imgur.com/EbrS1n6.png) diff --git a/config.yaml b/config.yaml index 9d69c75..e7757ed 100644 --- a/config.yaml +++ b/config.yaml @@ -81,14 +81,20 @@ profiles: - font - git - gdb - dev-bash: + dev-linux-bash: include: - bash - vim - dev-zsh: + dev-obsd-bash: + - bash + - vim + dev-linux-zsh: include: - zsh - vim + dev-obsd-zsh: + - zsh + - vim # Packages to be used above bash: diff --git a/dotfiles/zsh/marc-pygmalion.zsh-theme b/dotfiles/zsh/marc-pygmalion.zsh-theme index 7fa2af0..2f8e877 100644 --- a/dotfiles/zsh/marc-pygmalion.zsh-theme +++ b/dotfiles/zsh/marc-pygmalion.zsh-theme @@ -7,7 +7,7 @@ prompt_setup_pygmalion(){ ZSH_THEME_GIT_PROMPT_CLEAN="" base_prompt='%{$fg[green]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%1~%{$reset_color%}' - post_prompt='%{$fg[green]%} 水 %{$reset_color%}' + post_prompt=' ' base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g") post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g") @@ -23,14 +23,14 @@ prompt_pygmalion_precmd(){ local prompt_length=${#exp_nocolor} local nl="" - post_prompt='%{$fg[green]%} 水 %{$reset_color%}' + post_prompt=' ' if [ ${#gitinfo} -ne 0 ] ; then gitinfo=${gitinfo[1,-2]} fi - if [[ $prompt_length -gt 50 ]]; then + if [[ $prompt_length -gt 40 ]]; then nl=$'\n%{\r%}'; post_prompt='%{$fg[green]%}~> %{$reset_color%}'; fi diff --git a/dotfiles/zshrc b/dotfiles/zshrc index fb2b9a2..ecbce5d 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,5 +1,10 @@ export ZSH="/home/$USER/.oh-my-zsh" + ZSH_THEME="agnoster-plus" +{%@@ if profile == "dev-obsd-zsh" @@%} +ZSH_THEME="marc-theme" +{%@@ endif @@%} + DISABLE_AUTO_UPDATE="true" COMPLETION_WAITING_DOTS="true" DISABLE_UNTRACKED_FILES_DIRTY="true"