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

Merge branch 'master' of github.com:fklassen/ohmyzsh

Browse source 
* 'master' of github.com:fklassen/ohmyzsh: (38 commits)
  fix(aws): restore accidentally deleted variable
  feat(upgrade): add verbosity settings
  fix(uninstall): abort uninstall if unable to change shell (#10357)
  feat(juju): add functions to get current controller and model (#11572)
  fix(aws): do not print region if it's not defined
  feat(aws): set region when AWS_REGION is not set
  feat(gnu-utils): add `gindent` (#11569)
  fix(lib): set equivalent LS_COLORS and LSCOLORS variables
  feat(rails): add `rta` alias (#11553)
  docs(vi-mode): document how to add vi-mode info on the prompt (#11548)
  Fixing link to PA website in README
  feat(vi-mode): add settings for vi-mode cursor styles (#10860)
  fix(init): set completion colors on theme load, not with `precmd`
  feat(aws): add AWS_REGION to aws_prompt_info (#10062)
  fix(aliases): group properly aliases (#11546)
  fix(argocd): typo in filename
  feat(argocd): add completion plugin
  refactor(theme-and-appearance): reorganize and clean up logic (#11529)
  fix(lib): use `$BROWSER` in `open_command` if set (#11532)
  docs(brew): remove duplication (#11535)
  ...

 Conflicts:
	oh-my-zsh.sh
This commit is contained in:
Fred Klassen 2023-03-28 13:47:10 -07:00
commit 21c511d24e
No known key found for this signature in database
GPG key ID: E9E2149793BDE17E
47 changed files with 1103 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,8 @@
# dashed separator size
function afmagic_dashes {
# check either virtualenv or condaenv variables
local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
local python_env_dir="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
local python_env="${python_env_dir##*/}"
# if there is a python virtual environment and it is displayed in
# the prompt, account for it when returning the number of dashes