linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-16 02:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into merge_upstream

Browse source 
* upstream/master:
  feat(git): add aliases for gone branches (#9250)
  feat(git): add `gpod` alias
  chore: add `.idea` directory to `.gitignore`
  fix(gcloud): add location of latest snap install (#11502)
  fix(theme-and-appearance): test color ls with $ZSH directory
  fix(correction)!: remove aliases for non standard commands
  fix(af-magic): fix python venv checking logic (#11495)
  docs(lib/directories): comment how to disable alias (#11489)
  docs(lando): php support (#11491)
  fix(fzf): installation dir for brew M1 (#11490)
  fix(gradle): move compdef line (#11488)
  feat(amuse): add virtualenv support (#8987)
  feat(gradle): update completion from upstream (#11485)
  fix(git): `gpristine` requires two `--force` flags
  docs(git): remove duplicated line
  feat(azure): add `azure` plugin (#8848)
  feat(zsh-interactive-cd): sync version with upstream (#11024)
  feat(git)!: add `force-if-includes` flag (#11481)

 Conflicts:
	.gitignore
This commit is contained in:
Fred Klassen 2023-02-20 16:20:23 -08:00
commit 99045632a1
No known key found for this signature in database
GPG key ID: E9E2149793BDE17E
19 changed files with 599 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
themes/af-magic.zsh-theme
View file

@ -10,7 +10,7 @@ function afmagic_dashes {
# if there is a python virtual environment and it is displayed in
# the prompt, account for it when returning the number of dashes
if [[ -n "$python_env" && "$PS1" = \(* ]]; then
if [[ -n "$python_env" && "$PS1" = *\(${python_env}\)* ]]; then
echo $(( COLUMNS - ${#python_env} - 3 ))
else
echo $COLUMNS

8
themes/amuse.zsh-theme
View file

@ -11,8 +11,14 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg_bold[red]%}‹"
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
PROMPT='
%{$fg_bold[green]%}%~%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
%{$fg_bold[green]%}%~%{$reset_color%}$(git_prompt_info)$(virtualenv_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
$ '
RPROMPT='$(ruby_prompt_info)'
VIRTUAL_ENV_DISABLE_PROMPT=0
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %{$fg[green]%}🐍"
ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX