Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
22088545
Commit
22088545
authored
10 years ago
by
Robby Russell
Browse files
Options
Download
Plain Diff
Cleaning up conflict with merge of #2330
parents
6b3c9537
c05a28a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
themes/af-magic.zsh-theme
+6
-3
themes/af-magic.zsh-theme
with
6 additions
and
3 deletions
+6
-3
themes/af-magic.zsh-theme
View file @
22088545
...
...
@@ -8,8 +8,6 @@
# Created on: June 19, 2012
# Last modified on: June 20, 2012
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
...
...
@@ -27,7 +25,12 @@ eval my_gray='$FG[237]'
eval my_orange='$FG[214]'
# right prompt
RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
if type "virtualenv_prompt_info" > /dev/null
then
RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
else
RPROMPT='$my_gray%n@%m%{$reset_color%}%'
fi
# git settings
ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help