1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-21 00:57:24 +08:00

Compare commits

...

3 Commits

Author SHA1 Message Date
roodkcab
aab3bfff9f
fix(robbyrussell) multiline command editing (#11681)
Co-authored-by: chenshuoshi <chenshuoshi@inagora.cn>

Closes #11680
2023-05-09 12:27:22 +02:00
Carlo Sala
aaf83d37aa
docs(theme-and-appearance): reflect properly dcff7a7 changes 2023-05-09 12:10:05 +02:00
Carlo Sala
dcff7a7f08
fix(theme-and-appearance): make bsd ls to be default 2023-05-09 12:05:15 +02:00
3 changed files with 11 additions and 9 deletions

View File

@ -40,7 +40,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
- [Manual Installation](#manual-installation) - [Manual Installation](#manual-installation)
- [Installation Problems](#installation-problems) - [Installation Problems](#installation-problems)
- [Custom Plugins and Themes](#custom-plugins-and-themes) - [Custom Plugins and Themes](#custom-plugins-and-themes)
- [Disable GNU ls in macOS and freeBSD systems](#disable-gnu-ls) - [Enable GNU ls in macOS and freeBSD systems](#enable-gnu-ls)
- [Skip aliases](#skip-aliases) - [Skip aliases](#skip-aliases)
- [Getting Updates](#getting-updates) - [Getting Updates](#getting-updates)
- [Updates verbosity](#updates-verbosity) - [Updates verbosity](#updates-verbosity)
@ -279,18 +279,20 @@ If you have many functions that go well together, you can put them as a `XYZ.plu
If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`. If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
### Disable GNU ls in macOS and freeBSD systems ### Enable GNU ls in macOS and freeBSD systems
<a name="disable-gnu-ls"></a> <a name="enable-gnu-ls"></a>
The default behaviour in Oh My Zsh is to use GNU `ls` even in macOS and freeBSD systems if it's installed (as The default behaviour in Oh My Zsh is to use BSD `ls` in macOS and freeBSD systems. If GNU `ls` is installed
`gls` command) when enabling colorized `ls` in `lib/theme-and-appearance.zsh`. If you want to disable this (as `gls` command), you can choose to use it instead. To do it, you can use zstyle-based config before
behaviour you can use zstyle-based config before sourcing `oh-my-zsh.sh`: sourcing `oh-my-zsh.sh`:
```zsh ```zsh
zstyle ':omz:lib:theme-and-appearance' gnu-ls no zstyle ':omz:lib:theme-and-appearance' gnu-ls no
``` ```
_Note: this is not compatible with `DISABLE_LS_COLORS=true`_
### Skip aliases ### Skip aliases
<a name="remove-directories-aliases"></a> <a name="remove-directories-aliases"></a>

View File

@ -65,7 +65,7 @@ case "$OSTYPE" in
test-ls-args ls -G && alias ls='ls -G' test-ls-args ls -G && alias ls='ls -G'
# Only use GNU ls if installed and there are user defaults for $LS_COLORS, # Only use GNU ls if installed and there are user defaults for $LS_COLORS,
# as the default coloring scheme is not very pretty # as the default coloring scheme is not very pretty
zstyle -T ':omz:lib:theme-and-appearance' gnu-ls \ zstyle -t ':omz:lib:theme-and-appearance' gnu-ls \
&& test-ls-args gls --color \ && test-ls-args gls --color \
&& alias ls='gls --color=tty' && alias ls='gls --color=tty'
;; ;;

View File

@ -1,5 +1,5 @@
PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )" PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ ) %{$fg[cyan]%}%c%{$reset_color%}"
PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)' PROMPT+=' $(git_prompt_info)'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "