diff --git a/dotfiles/lib/zsh/prompt.sh b/dotfiles/lib/zsh/prompt.sh index 397c46f6..6955a427 100644 --- a/dotfiles/lib/zsh/prompt.sh +++ b/dotfiles/lib/zsh/prompt.sh @@ -29,9 +29,39 @@ function sandbox_prompt() { fi } -PROMPT='╭─% %{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(hostname -s)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}$(current_directory)%{$reset_color%}$(git_prompt_info)$(sandbox_prompt) -$FG[255]%{$reset_color%}╰─± ' +function prompt_use_custom_colors() { + export USERNAME_COLOR="$FG[040]" + export SEPARATOR_COLOR="$FG[239]" + export HOSTNAME_COLOR="$FG[033]" + export CURRENT_DIRECTORY_COLOR="$FG[226]" +} + +function prompt_use_basic_colors() { + export USERNAME_COLOR="$fg[blue]" + export SEPARATOR_COLOR="$fg[black]" + export HOSTNAME_COLOR="$fg[green]" + export CURRENT_DIRECTORY_COLOR="$fg[yellow]" +} + +function prompt_grey_separator() { + export USERNAME_COLOR="$fg[blue]" + export SEPARATOR_COLOR="$FG[239]" + export HOSTNAME_COLOR="$fg[green]" + export CURRENT_DIRECTORY_COLOR="$fg[yellow]" +} + +function print_with_color() { + echo "%{$2%}$1%{$reset_color%}" +} + +function separator() { + print_with_color "$1" "$SEPARATOR_COLOR" +} + +PROMPT='╭─% $(print_with_color "%n" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$terminfo[bold]$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)$(sandbox_prompt) +╰─± ' PS2='' RPROMPT='Last Exit Code: $?' +prompt_use_custom_colors diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist index fcbfc11d..d1d77603 100644 --- a/resources/com.googlecode.iterm2.plist +++ b/resources/com.googlecode.iterm2.plist @@ -4525,7 +4525,7 @@ NSWindow Frame NSColorPanel 427 366 214 309 0 0 1920 1080 NSWindow Frame Preferences - 662 255 924 485 0 0 1920 1080 + 86 531 924 485 0 0 1920 1058 NSWindow Frame SUStatusFrame 768 697 384 129 0 0 1920 1058 NSWindow Frame iTerm Window 0 @@ -4544,146 +4544,146 @@ Ansi 0 Color Blue Component - 0.0 + 0.45882353186607361 Green Component - 0.0 + 0.45882353186607361 Red Component - 0.0 + 0.45882353186607361 Ansi 1 Color Blue Component - 0.0 + 0.30196079611778259 Green Component - 0.0 + 0.364705890417099 Red Component - 0.73333334922790527 + 0.50980395078659058 Ansi 10 Color Blue Component - 0.3333333432674408 + 0.66666668653488159 Green Component - 1 + 0.85098040103912354 Red Component - 0.3333333432674408 + 0.59607845544815063 Ansi 11 Color Blue Component - 0.3333333432674408 + 0.61568629741668701 Green Component - 1 + 0.90588235855102539 Red Component - 1 + 0.98039215803146362 Ansi 12 Color Blue Component - 1 + 0.81176471710205078 Green Component - 0.3333333432674408 + 0.76470589637756348 Red Component - 0.3333333432674408 + 0.47843137383460999 Ansi 13 Color Blue Component - 1 + 0.63137257099151611 Green Component - 0.3333333432674408 + 0.69803923368453979 Red Component - 1 + 0.83921569585800171 Ansi 14 Color Blue Component - 1 + 0.87843137979507446 Green Component - 1 + 0.87843137979507446 Red Component - 0.3333333432674408 + 0.67843139171600342 Ansi 15 Color Blue Component - 1 + 0.87843137979507446 Green Component - 1 + 0.87843137979507446 Red Component - 1 + 0.87843137979507446 Ansi 2 Color Blue Component - 0.0 + 0.38431373238563538 Green Component - 0.73333334922790527 + 0.54901963472366333 Red Component - 0.0 + 0.44705882668495178 Ansi 3 Color Blue Component - 0.0 + 0.42745098471641541 Green Component - 0.73333334922790527 + 0.63137257099151611 Red Component - 0.73333334922790527 + 0.67843139171600342 Ansi 4 Color Blue Component - 0.73333334922790527 + 0.50980395078659058 Green Component - 0.0 + 0.48235294222831726 Red Component - 0.0 + 0.30196079611778259 Ansi 5 Color Blue Component - 0.73333334922790527 + 0.40392157435417175 Green Component - 0.0 + 0.44705882668495178 Red Component - 0.73333334922790527 + 0.54117649793624878 Ansi 6 Color Blue Component - 0.73333334922790527 + 0.58039218187332153 Green Component - 0.73333334922790527 + 0.58039218187332153 Red Component - 0.0 + 0.44705882668495178 Ansi 7 Color Blue Component - 0.73333334922790527 + 0.87843137979507446 Green Component - 0.73333334922790527 + 0.87843137979507446 Red Component - 0.73333334922790527 + 0.87843137979507446 Ansi 8 Color Blue Component - 0.3333333432674408 + 0.54117649793624878 Green Component - 0.3333333432674408 + 0.54117649793624878 Red Component - 0.3333333432674408 + 0.54117649793624878 Ansi 9 Color Blue Component - 0.3333333432674408 + 0.47843137383460999 Green Component - 0.3333333432674408 + 0.57647061347961426 Red Component - 1 + 0.81176471710205078 Automatically Log @@ -4692,11 +4692,11 @@ Background Color Blue Component - 0.0 + 0.20784313976764679 Green Component - 0.0 + 0.20392157137393951 Red Component - 0.0 + 0.14117647707462311 Background Image Is Tiled @@ -4715,11 +4715,11 @@ Bold Color Blue Component - 1 + 0.56470590829849243 Green Component - 1 + 0.53333336114883423 Red Component - 1 + 0.39215686917304993 Character Encoding 4 @@ -4732,20 +4732,20 @@ Cursor Color Blue Component - 0.73333334922790527 + 0.47843137383460999 Green Component - 0.73333334922790527 + 0.39215686917304993 Red Component - 0.73333334922790527 + 0.34117648005485535 Cursor Text Color Blue Component - 1 + 0.19607843458652496 Green Component - 1 + 0.19607843458652496 Red Component - 1 + 0.19607843458652496 Cursor Type 2 @@ -4766,11 +4766,11 @@ Foreground Color Blue Component - 0.73333334922790527 + 0.83137255907058716 Green Component - 0.73333334922790527 + 0.90588235855102539 Red Component - 0.73333334922790527 + 0.83137255907058716 Guid 3314520D-1E49-4605-AFCE-EA48A596636F @@ -5112,20 +5112,20 @@ Selected Text Color Blue Component - 0.0 + 0.074509806931018829 Green Component - 0.0 + 0.54509806632995605 Red Component - 0.0 + 0.61960786581039429 Selection Color Blue Component 1 Green Component - 0.8353000283241272 + 1 Red Component - 0.70980000495910645 + 1 Semantic History