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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
linsilence 2019-07-27 19:43:35 +08:00
commit 0cae5f5a57
5 changed files with 3 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -186,8 +186,7 @@ flag `--unattended` to the `install.sh` script. This will have the effect of not
the default shell, and also won't run `zsh` when the installation has finished. the default shell, and also won't run `zsh` when the installation has finished.
```shell ```shell
curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended
sh install.sh --unattended
``` ```
#### Installing from a forked repository #### Installing from a forked repository

12
plugins/bwana/README.md
View file

@ -1,12 +0,0 @@
# Bwana
This plugin provides a function to open `man` pages directly with [Bwana](https://www.bruji.com/bwana/).
To use it add bwana to the plugins array in your zshrc file.
```bash
plugins=(... bwana)
```
The `bwana` function opens the man page of the passed argument in the Bwana app.
For example: `bwana ln` opens the man page for `ln` in Bwana.

13
plugins/bwana/bwana.plugin.zsh
View file

@ -1,13 +0,0 @@
#
# Requires https://www.bruji.com/bwana/
#
if [[ -e /Applications/Bwana.app ]] ||
( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana )
then
function bwana() {
open "man:$1"
}
else
echo "Bwana lets you read man files in Safari through a man: URI scheme"
echo "To use it within Zsh, install it from https://www.bruji.com/bwana/"
fi

1
plugins/git/README.md
View file

@ -123,6 +123,7 @@ plugins=(... git)
| grbi | git rebase -i | | grbi | git rebase -i |
| grbm | git rebase master | | grbm | git rebase master |
| grbs | git rebase --skip | | grbs | git rebase --skip |
| grev | git revert |
| grh | git reset | | grh | git reset |
| grhh | git reset --hard | | grhh | git reset --hard |
| groh | git reset origin/$(git_current_branch) --hard | | groh | git reset origin/$(git_current_branch) --hard |

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

@ -6,7 +6,7 @@ if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
# primary prompt # primary prompt
PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%} PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%}
$FG[032]%~\ $FG[032]%~\
$(git_prompt_info) \ $(git_prompt_info) \
$FG[105]%(!.#.»)%{$reset_color%} ' $FG[105]%(!.#.»)%{$reset_color%} '