0
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-12 04:01:14 +02:00

style: remove trailing whitespace (#12303)

This commit is contained in:
vladislav doster 2024-03-26 03:55:16 -05:00 committed by GitHub
parent a168efe73e
commit 1d09c6bb0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
73 changed files with 138 additions and 138 deletions

View file

@ -1,12 +1,12 @@
# Put files in this folder to add your own custom functionality. # Put files in this folder to add your own custom functionality.
# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization # See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization
# #
# Files in the custom/ directory will be: # Files in the custom/ directory will be:
# - loaded automatically by the init script, in alphabetical order # - loaded automatically by the init script, in alphabetical order
# - loaded last, after all built-ins in the lib/ directory, to override them # - loaded last, after all built-ins in the lib/ directory, to override them
# - ignored by git by default # - ignored by git by default
# #
# Example: add custom/shortcuts.zsh for shortcuts to your local projects # Example: add custom/shortcuts.zsh for shortcuts to your local projects
# #
# brainstormr=~/Projects/development/planetargon/brainstormr # brainstormr=~/Projects/development/planetargon/brainstormr
# cd $brainstormr # cd $brainstormr

View file

@ -1,6 +1,6 @@
# Put your custom themes in this folder. # Put your custom themes in this folder.
# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes # See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes
# #
# Example: # Example:
PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% " PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "

View file

@ -13,7 +13,7 @@ function handle_completion_insecurities() {
# /usr/share/zsh/5.0.6 # /usr/share/zsh/5.0.6
# #
# Since the ignorable first line is printed to stderr and thus not captured, # Since the ignorable first line is printed to stderr and thus not captured,
# stderr is squelched to prevent this output from leaking to the user. # stderr is squelched to prevent this output from leaking to the user.
local -aU insecure_dirs local -aU insecure_dirs
insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} ) insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} )

View file

@ -30,7 +30,7 @@
# #
# This is written in a defensive style so it still works (and can detect) cases when # This is written in a defensive style so it still works (and can detect) cases when
# basic functionality like echo and which have been redefined. In particular, almost # basic functionality like echo and which have been redefined. In particular, almost
# everything is invoked with "builtin" or "command", to work in the face of user # everything is invoked with "builtin" or "command", to work in the face of user
# redefinitions. # redefinitions.
# #
# OPTIONS # OPTIONS
@ -59,7 +59,7 @@ function omz_diagnostic_dump() {
emulate -L zsh emulate -L zsh
builtin echo "Generating diagnostic dump; please be patient..." builtin echo "Generating diagnostic dump; please be patient..."
local thisfcn=omz_diagnostic_dump local thisfcn=omz_diagnostic_dump
local -A opts local -A opts
local opt_verbose opt_noverbose opt_outfile local opt_verbose opt_noverbose opt_outfile
@ -90,7 +90,7 @@ function omz_diagnostic_dump() {
builtin echo builtin echo
builtin echo Diagnostic dump file created at: "$outfile" builtin echo Diagnostic dump file created at: "$outfile"
builtin echo builtin echo
builtin echo To share this with OMZ developers, post it as a gist on GitHub builtin echo To share this with OMZ developers, post it as a gist on GitHub
builtin echo at "https://gist.github.com" and share the link to the gist. builtin echo at "https://gist.github.com" and share the link to the gist.
builtin echo builtin echo
builtin echo "WARNING: This dump file contains all your zsh and omz configuration files," builtin echo "WARNING: This dump file contains all your zsh and omz configuration files,"
@ -105,8 +105,8 @@ function _omz_diag_dump_one_big_text() {
builtin echo oh-my-zsh diagnostic dump builtin echo oh-my-zsh diagnostic dump
builtin echo builtin echo
builtin echo $outfile builtin echo $outfile
builtin echo builtin echo
# Basic system and zsh information # Basic system and zsh information
command date command date
command uname -a command uname -a
@ -151,7 +151,7 @@ function _omz_diag_dump_one_big_text() {
# Core command definitions # Core command definitions
_omz_diag_dump_check_core_commands || return 1 _omz_diag_dump_check_core_commands || return 1
builtin echo builtin echo
# ZSH Process state # ZSH Process state
builtin echo Process state: builtin echo Process state:
@ -167,7 +167,7 @@ function _omz_diag_dump_one_big_text() {
#TODO: Should this include `env` instead of or in addition to `export`? #TODO: Should this include `env` instead of or in addition to `export`?
builtin echo Exported: builtin echo Exported:
builtin echo $(builtin export | command sed 's/=.*//') builtin echo $(builtin export | command sed 's/=.*//')
builtin echo builtin echo
builtin echo Locale: builtin echo Locale:
command locale command locale
builtin echo builtin echo
@ -181,7 +181,7 @@ function _omz_diag_dump_one_big_text() {
builtin echo builtin echo
builtin echo 'compaudit output:' builtin echo 'compaudit output:'
compaudit compaudit
builtin echo builtin echo
builtin echo '$fpath directories:' builtin echo '$fpath directories:'
command ls -lad $fpath command ls -lad $fpath
builtin echo builtin echo
@ -224,7 +224,7 @@ function _omz_diag_dump_one_big_text() {
local cfgfile cfgfiles local cfgfile cfgfiles
# Some files for bash that zsh does not use are intentionally included # Some files for bash that zsh does not use are intentionally included
# to help with diagnosing behavior differences between bash and zsh # to help with diagnosing behavior differences between bash and zsh
cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout
$zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
~/.zsh.pre-oh-my-zsh ~/.zsh.pre-oh-my-zsh
/etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout ) /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
@ -258,8 +258,8 @@ function _omz_diag_dump_check_core_commands() {
# (For back-compatibility, if any of these are newish, they should be removed, # (For back-compatibility, if any of these are newish, they should be removed,
# or at least made conditional on the version of the current running zsh.) # or at least made conditional on the version of the current running zsh.)
# "history" is also excluded because OMZ is known to redefine that # "history" is also excluded because OMZ is known to redefine that
reserved_words=( do done esac then elif else fi for case if while function reserved_words=( do done esac then elif else fi for case if while function
repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}' repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}'
) )
builtins=( alias autoload bg bindkey break builtin bye cd chdir command builtins=( alias autoload bg bindkey break builtin bye cd chdir command
comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
@ -331,7 +331,7 @@ function _omz_diag_dump_os_specific_version() {
case "$OSTYPE" in case "$OSTYPE" in
darwin*) darwin*)
osname=$(command sw_vers -productName) osname=$(command sw_vers -productName)
osver=$(command sw_vers -productVersion) osver=$(command sw_vers -productVersion)
builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)" builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
;; ;;
cygwin) cygwin)

View file

@ -152,7 +152,7 @@ unset zcompdump_revision zcompdump_fpath zcompdump_refresh
# zcompile the completion dump file if the .zwc is older or missing. # zcompile the completion dump file if the .zwc is older or missing.
if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
zrecompile -q -p "$ZSH_COMPDUMP" zrecompile -q -p "$ZSH_COMPDUMP"
command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock" command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
fi fi
_omz_source() { _omz_source() {

View file

@ -28,6 +28,6 @@ plugins=(... ansible)
## Maintainer ## Maintainer
### [Deepankumar](https://github.com/deepan10) ### [Deepankumar](https://github.com/deepan10)
[https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin) [https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin)

View file

@ -280,7 +280,7 @@ if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
test -s "${AWS_STATE_FILE}" || return test -s "${AWS_STATE_FILE}" || return
aws_state=($(cat $AWS_STATE_FILE)) aws_state=($(cat $AWS_STATE_FILE))
export AWS_DEFAULT_PROFILE="${aws_state[1]}" export AWS_DEFAULT_PROFILE="${aws_state[1]}"
export AWS_PROFILE="$AWS_DEFAULT_PROFILE" export AWS_PROFILE="$AWS_DEFAULT_PROFILE"
export AWS_EB_PROFILE="$AWS_DEFAULT_PROFILE" export AWS_EB_PROFILE="$AWS_DEFAULT_PROFILE"

View file

@ -39,7 +39,7 @@ index 2fd5f2cd..9d89a464 100644
PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )" PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
-PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)' -PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
+PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_prompt_info)' +PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_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%} "
``` ```

View file

@ -2,7 +2,7 @@
_source-from-omz-settings() { _source-from-omz-settings() {
local _chruby_path _chruby_auto local _chruby_path _chruby_auto
zstyle -s :omz:plugins:chruby path _chruby_path || return 1 zstyle -s :omz:plugins:chruby path _chruby_path || return 1
zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1 zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1
@ -23,7 +23,7 @@ _source-from-homebrew() {
if [[ -h /usr/local/opt/chruby ]];then if [[ -h /usr/local/opt/chruby ]];then
_brew_prefix="/usr/local/opt/chruby" _brew_prefix="/usr/local/opt/chruby"
else else
# ok , it is not default prefix # ok , it is not default prefix
# this call to brew is expensive ( about 400 ms ), so at least let's make it only once # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
_brew_prefix=$(brew --prefix chruby) _brew_prefix=$(brew --prefix chruby)
fi fi

View file

@ -50,7 +50,7 @@ Alternatively, seek out the [online documentation][3]. And don't forget, there a
## Contributors ## Contributors
Contributed to `oh_my_zsh` by [benwilcock][2]. Contributed to `oh_my_zsh` by [benwilcock][2].
[1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html [1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html
[2]: https://github.com/benwilcock [2]: https://github.com/benwilcock

View file

@ -24,7 +24,7 @@ Also provides the following aliases:
* **cfc:** Copies the compiled JS to your clipboard. Very useful when you want * **cfc:** Copies the compiled JS to your clipboard. Very useful when you want
to run the code in a JS console. to run the code in a JS console.
* **cfp:** Compiles from your currently copied clipboard. Useful when you want * **cfp:** Compiles from your currently copied clipboard. Useful when you want
to compile large/multi-line snippets to compile large/multi-line snippets
* **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the * **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the

View file

@ -7,7 +7,7 @@
if (( ${+commands[compleat]} )); then if (( ${+commands[compleat]} )); then
local prefix="${commands[compleat]:h:h}" local prefix="${commands[compleat]:h:h}"
local setup="${prefix}/share/compleat-1.0/compleat_setup" local setup="${prefix}/share/compleat-1.0/compleat_setup"
if [[ -f "$setup" ]]; then if [[ -f "$setup" ]]; then
if ! bashcompinit >/dev/null 2>&1; then if ! bashcompinit >/dev/null 2>&1; then
@ -15,6 +15,6 @@ if (( ${+commands[compleat]} )); then
bashcompinit -i bashcompinit -i
fi fi
source "$setup" source "$setup"
fi fi
fi fi

View file

@ -1,4 +1,4 @@
# copy the active line from the command line buffer # copy the active line from the command line buffer
# onto the system clipboard # onto the system clipboard
copybuffer () { copybuffer () {

View file

@ -19,7 +19,7 @@ dash
- Query for something in dash app: `dash query` - Query for something in dash app: `dash query`
``` ```
dash golang dash golang
``` ```
- You can optionally provide a keyword: `dash [keyword:]query` - You can optionally provide a keyword: `dash [keyword:]query`

View file

@ -11,7 +11,7 @@ _dotnet_completion() {
compdef _dotnet_completion dotnet compdef _dotnet_completion dotnet
# Aliases bellow are here for backwards compatibility # Aliases bellow are here for backwards compatibility
# added by Shaun Tabone (https://github.com/xontab) # added by Shaun Tabone (https://github.com/xontab)
alias dn='dotnet new' alias dn='dotnet new'
alias dr='dotnet run' alias dr='dotnet run'

View file

@ -24,7 +24,7 @@ unset _omz_emoji_plugin_dir
# This is a combining character that can be placed after any other character to surround # This is a combining character that can be placed after any other character to surround
# it in a "keycap" symbol. # it in a "keycap" symbol.
# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. # The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc.
# It's unclear whether this should be in the $emoji array, because those characters are all ones # It's unclear whether this should be in the $emoji array, because those characters are all ones
# which can be displayed on their own. # which can be displayed on their own.
@ -63,9 +63,9 @@ function random_emoji() {
[[ $list_size -eq 0 ]] && return 1 [[ $list_size -eq 0 ]] && return 1
local random_index=$(( ( RANDOM % $list_size ) + 1 )) local random_index=$(( ( RANDOM % $list_size ) + 1 ))
local name=${names[$random_index]} local name=${names[$random_index]}
if [[ "$group" == "flags" ]]; then if [[ "$group" == "flags" ]]; then
echo ${emoji_flags[$name]} echo ${emoji_flags[$name]}
else else
echo ${emoji[$name]} echo ${emoji[$name]}
fi fi
} }
@ -86,22 +86,22 @@ function display_emoji() {
# terminals treat these emoji chars as single-width. # terminals treat these emoji chars as single-width.
local counter=1 local counter=1
for i in $names; do for i in $names; do
if [[ "$group" == "flags" ]]; then if [[ "$group" == "flags" ]]; then
printf '%s ' "$emoji_flags[$i]" printf '%s ' "$emoji_flags[$i]"
else else
printf '%s ' "$emoji[$i]" printf '%s ' "$emoji[$i]"
fi fi
# New line every 20 emoji, to avoid weirdnesses # New line every 20 emoji, to avoid weirdnesses
if (($counter % 20 == 0)); then if (($counter % 20 == 0)); then
printf "\n" printf "\n"
fi fi
let counter=$counter+1 let counter=$counter+1
done done
print print
for i in $names; do for i in $names; do
if [[ "$group" == "flags" ]]; then if [[ "$group" == "flags" ]]; then
echo "${emoji_flags[$i]} = $i" echo "${emoji_flags[$i]} = $i"
else else
echo "${emoji[$i]} = $i" echo "${emoji[$i]} = $i"
fi fi
done done

View file

@ -4,7 +4,7 @@
# AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net) # AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
# VERSION: 1.0.0 # VERSION: 1.0.0
# DEPENDS: emoji plugin # DEPENDS: emoji plugin
# #
# There are different sets of emoji characters available, to choose a different # There are different sets of emoji characters available, to choose a different
# set export emotty_set to the name of the set you would like to use, e.g.: # set export emotty_set to the name of the set you would like to use, e.g.:
# % export emotty_set=nature # % export emotty_set=nature

View file

@ -40,7 +40,7 @@ plugins=(... encode64)
### Encoding a file ### Encoding a file
Encode a file's contents to base64 and save output to text file. Encode a file's contents to base64 and save output to text file.
**NOTE:** Takes provided file and saves encoded content as new file with `.txt` extension **NOTE:** Takes provided file and saves encoded content as new file with `.txt` extension
- From parameter - From parameter

View file

@ -1,14 +1,14 @@
# Use Ctrl-Z to switch back to Vim # Use Ctrl-Z to switch back to Vim
I frequently need to execute random commands in my shell. To achieve it I pause I frequently need to execute random commands in my shell. To achieve it I pause
Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim. Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
to Vim. I could not find a solution, so I developed one on my own that to Vim. I could not find a solution, so I developed one on my own that
works wonderfully with ZSH. works wonderfully with ZSH.
Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/ Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
Credits: Credits:
- original idea by @sheerun - original idea by @sheerun
- added to OMZ by @mbologna - added to OMZ by @mbologna

View file

@ -71,13 +71,13 @@ them, add `<variable>=<value>` to your zshrc file, before Oh My Zsh is sourced.
For example: `fastfile_var_prefix='@'`. For example: `fastfile_var_prefix='@'`.
- `fastfile_var_prefix`: prefix for the global aliases created. Controls the prefix of the - `fastfile_var_prefix`: prefix for the global aliases created. Controls the prefix of the
created global aliases. created global aliases.
**Default:** `§` (section sign), easy to type in a german keyboard via the combination **Default:** `§` (section sign), easy to type in a german keyboard via the combination
[`⇧ Shift`+`3`](https://en.wikipedia.org/wiki/German_keyboard_layout#/media/File:KB_Germany.svg), [`⇧ Shift`+`3`](https://en.wikipedia.org/wiki/German_keyboard_layout#/media/File:KB_Germany.svg),
or using `⌥ Option`+`6` in macOS. or using `⌥ Option`+`6` in macOS.
- `fastfile_dir`: directory where the fastfile shortcuts are stored. Needs to end - `fastfile_dir`: directory where the fastfile shortcuts are stored. Needs to end
with a trailing slash. with a trailing slash.
**Default:** `$HOME/.fastfile/`. **Default:** `$HOME/.fastfile/`.
## Author ## Author

View file

@ -58,7 +58,7 @@ function fl {
tell application forkLiftSetapp tell application forkLiftSetapp
activate activate
set forkLiftVersion to version set forkLiftVersion to version
end tell end tell
else if forkLift3 is not null and application forkLift3 is running then else if forkLift3 is not null and application forkLift3 is running then
tell application forkLift3 tell application forkLift3
activate activate
@ -84,7 +84,7 @@ function fl {
else if forkLift is not null then else if forkLift is not null then
set appName to forkLift set appName to forkLift
end if end if
tell application appName tell application appName
activate activate
set forkLiftVersion to version set forkLiftVersion to version

View file

@ -62,7 +62,7 @@ function fzf_setup_using_base_dir() {
function fzf_setup_using_debian() { function fzf_setup_using_debian() {
if (( ! $+commands[apt] && ! $+commands[apt-get] )); then if (( ! $+commands[apt] && ! $+commands[apt-get] )); then
# Not a debian based distro # Not a debian based distro
return 1 return 1
fi fi

View file

@ -14,7 +14,7 @@ __gnu_utils() {
local -a gcmds local -a gcmds
local gcmd local gcmd
# coreutils # coreutils
gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod' gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
'gchown' 'gchroot' 'gcksum' 'gcomm' 'gcp' 'gcsplit' 'gcut' 'gdate' 'gchown' 'gchroot' 'gcksum' 'gcomm' 'gcp' 'gcsplit' 'gcut' 'gdate'
'gdd' 'gdf' 'gdir' 'gdircolors' 'gdirname' 'gdu' 'gecho' 'genv' 'gexpand' 'gdd' 'gdf' 'gdir' 'gdircolors' 'gdirname' 'gdu' 'gecho' 'genv' 'gexpand'
@ -41,7 +41,7 @@ __gnu_utils() {
for gcmd in "${gcmds[@]}"; do for gcmd in "${gcmds[@]}"; do
# Do nothing if the command isn't found # Do nothing if the command isn't found
(( ${+commands[$gcmd]} )) || continue (( ${+commands[$gcmd]} )) || continue
# This method allows for builtin commands to be primary but it's # This method allows for builtin commands to be primary but it's
# lost if hash -r or rehash is executed, or if $PATH is updated. # lost if hash -r or rehash is executed, or if $PATH is updated.
# Thus, a preexec hook is needed, which will only run if whoami # Thus, a preexec hook is needed, which will only run if whoami

View file

@ -7,7 +7,7 @@ _enumerateGrailsScripts() {
then then
directories+=(plugins/*/scripts) directories+=(plugins/*/scripts)
fi fi
# Enumerate all of the Groovy files # Enumerate all of the Groovy files
files=() files=()
for dir in $directories; for dir in $directories;
@ -17,13 +17,13 @@ _enumerateGrailsScripts() {
files+=($dir/[^_]*.groovy) files+=($dir/[^_]*.groovy)
fi fi
done done
# Don't try to basename () # Don't try to basename ()
if [ ${#files} -eq 0 ]; if [ ${#files} -eq 0 ];
then then
return return
fi fi
scripts=() scripts=()
for file in $files for file in $files
do do
@ -42,19 +42,19 @@ _enumerateGrailsScripts() {
done done
echo $scripts echo $scripts
} }
_grails() { _grails() {
if (( CURRENT == 2 )); then if (( CURRENT == 2 )); then
scripts=( $(_enumerateGrailsScripts) ) scripts=( $(_enumerateGrailsScripts) )
if [ ${#scripts} -ne 0 ]; if [ ${#scripts} -ne 0 ];
then then
_multi_parts / scripts _multi_parts / scripts
return return
fi fi
fi fi
_files _files
} }
compdef _grails grails compdef _grails grails

View file

@ -57,13 +57,13 @@ Using [antigen](https://github.com/zsh-users/antigen):
1. Add the `antigen bundle` command just before `antigen apply`, like this: 1. Add the `antigen bundle` command just before `antigen apply`, like this:
``` ```
antigen bundle zsh-users/zsh-history-substring-search antigen bundle zsh-users/zsh-history-substring-search
antigen apply antigen apply
``` ```
2. Then, **after** `antigen apply`, add the key binding configurations, like this: 2. Then, **after** `antigen apply`, add the key binding configurations, like this:
``` ```
# zsh-history-substring-search configuration # zsh-history-substring-search configuration
bindkey '^[[A' history-substring-search-up # or '\eOA' bindkey '^[[A' history-substring-search-up # or '\eOA'
@ -120,7 +120,7 @@ Usage
bindkey "$terminfo[kcuu1]" history-substring-search-up bindkey "$terminfo[kcuu1]" history-substring-search-up
bindkey "$terminfo[kcud1]" history-substring-search-down bindkey "$terminfo[kcud1]" history-substring-search-down
Users have also observed that `[OA` and `[OB` are correct values, Users have also observed that `[OA` and `[OB` are correct values,
_even if_ these were not the observed values. If you are having trouble _even if_ these were not the observed values. If you are having trouble
with the observed values, give these a try. with the observed values, give these a try.

View file

@ -3,13 +3,13 @@ alias ih="ionic --help"
alias ist="ionic start" alias ist="ionic start"
alias ii="ionic info" alias ii="ionic info"
alias is="ionic serve" alias is="ionic serve"
alias icba="ionic cordova build android" alias icba="ionic cordova build android"
alias icbi="ionic cordova build ios" alias icbi="ionic cordova build ios"
alias icra="ionic cordova run android" alias icra="ionic cordova run android"
alias icri="ionic cordova run ios" alias icri="ionic cordova run ios"
alias icrsa="ionic cordova resources android" alias icrsa="ionic cordova resources android"
alias icrsi="ionic cordova resources ios" alias icrsi="ionic cordova resources ios"
alias icpaa="ionic cordova platform add android" alias icpaa="ionic cordova platform add android"
alias icpai="ionic cordova platform add ios" alias icpai="ionic cordova platform add ios"
alias icpra="ionic cordova platform rm android" alias icpra="ionic cordova platform rm android"
alias icpri="ionic cordova platform rm ios" alias icpri="ionic cordova platform rm ios"

View file

@ -9,7 +9,7 @@ plugins=(... iterm2)
``` ```
Optionally, the plugin also applies the [Shell Integration Script for iTerm2](https://iterm2.com/documentation-shell-integration.html). Optionally, the plugin also applies the [Shell Integration Script for iTerm2](https://iterm2.com/documentation-shell-integration.html).
You can enable the integration with zstyle. It's important to add this line You can enable the integration with zstyle. It's important to add this line
before the line sourcing oh-my-zsh: before the line sourcing oh-my-zsh:
``` ```

View file

@ -8,7 +8,7 @@
if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then
# maybe make it the default in the future and allow opting out? # maybe make it the default in the future and allow opting out?
if zstyle -t ':omz:plugins:iterm2' shell-integration; then if zstyle -t ':omz:plugins:iterm2' shell-integration; then
# Handle $0 according to the standard: # Handle $0 according to the standard:
# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}" 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"

View file

@ -2,12 +2,12 @@
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

View file

@ -35,7 +35,7 @@ This plugin supplies one command, `jira`, through which all its features are exp
### Jira Branch usage notes ### Jira Branch usage notes
The branch name may have prefixes ending in "/": "feature/MP-1234", and also suffixes The branch name may have prefixes ending in "/": "feature/MP-1234", and also suffixes
starting with "_": "MP-1234_fix_dashboard". In both these cases, the issue opened will be "MP-1234" starting with "_": "MP-1234_fix_dashboard". In both these cases, the issue opened will be "MP-1234"
This is also checks if the prefix is in the name, and adds it if not, so: "MP-1234" opens the issue "MP-1234", This is also checks if the prefix is in the name, and adds it if not, so: "MP-1234" opens the issue "MP-1234",

View file

@ -184,7 +184,7 @@ jmodel() {
fi fi
local model="$(yq e ".controllers.$(jcontroller).current-model" < ~/.local/share/juju/models.yaml | cut -d/ -f2)" local model="$(yq e ".controllers.$(jcontroller).current-model" < ~/.local/share/juju/models.yaml | cut -d/ -f2)"
if [[ -z "$model" ]]; then if [[ -z "$model" ]]; then
echo "--" echo "--"
return 1 return 1

View file

@ -4,5 +4,5 @@
if [ $commands[kn] ]; then if [ $commands[kn] ]; then
source <(kn completion zsh) source <(kn completion zsh)
compdef _kn kn compdef _kn kn
fi fi

View file

@ -1,6 +1,6 @@
#compdef port #compdef port
local subcmds local subcmds
# we cache the list of ports # we cache the list of ports
# we shall use some cache policy to avoid problems with new ports # we shall use some cache policy to avoid problems with new ports
@ -31,8 +31,8 @@ subcmds=(
'file' 'file'
'help' 'help'
'info' 'info'
'install' 'install'
'installed' 'installed'
'list' 'list'
'livecheck' 'livecheck'
'location' 'location'
@ -51,7 +51,7 @@ subcmds=(
'test' 'test'
'unarchive' 'unarchive'
'uninstall' 'uninstall'
'upgrade' 'upgrade'
'variants' 'variants'
'version' 'version'
) )

View file

@ -1,6 +1,6 @@
## marked2 ## marked2
Plugin for Marked 2, a previewer for Markdown files on Mac OS X Plugin for Marked 2, a previewer for Markdown files on Mac OS X
### Requirements ### Requirements

View file

@ -1,6 +1,6 @@
## marktext ## marktext
Plugin for MarkText, a previewer for Markdown files on Mac OS X Plugin for MarkText, a previewer for Markdown files on Mac OS X
### Requirements ### Requirements

View file

@ -1,6 +1,6 @@
# MongoDB Atlas plugin # MongoDB Atlas plugin
This plugin adds completion for [Atlas](https://www.mongodb.com/docs/atlas/cli/stable/) a command line interface built specifically for This plugin adds completion for [Atlas](https://www.mongodb.com/docs/atlas/cli/stable/) a command line interface built specifically for
MongoDB Atlas. MongoDB Atlas.
To use it, add `mongo-atlas` to the plugins array in your zshrc file: To use it, add `mongo-atlas` to the plugins array in your zshrc file:

View file

@ -1,6 +1,6 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# FILE: n98-magerun.plugin.zsh # FILE: n98-magerun.plugin.zsh
# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin # DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin
# AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com) # AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com)
# AUTHOR: Jisse Reitsma (jisse at yireo dot com) # AUTHOR: Jisse Reitsma (jisse at yireo dot com)
# VERSION: 1.1.0 # VERSION: 1.1.0

View file

@ -27,6 +27,6 @@ alias nmap_detect_versions="sudo nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
alias nmap_check_for_vulns="nmap --script=vuln" alias nmap_check_for_vulns="nmap --script=vuln"
alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 " alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute " alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all "
alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy " alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
alias nmap_ping_scan="nmap -n -sP" alias nmap_ping_scan="nmap -n -sP"

View file

@ -89,7 +89,7 @@ __plan() {
'-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \ '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
'-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \ '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
'-no-color[Disables colored command output.]' \ '-no-color[Disables colored command output.]' \
'-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]' '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]'
} }
__run() { __run() {

View file

@ -58,7 +58,7 @@ alias npmt="npm test"
# Run npm scripts # Run npm scripts
alias npmR="npm run" alias npmR="npm run"
# Run npm publish # Run npm publish
alias npmP="npm publish" alias npmP="npm publish"
# Run npm init # Run npm init

View file

@ -16,7 +16,7 @@ if [[ -z "$NVM_DIR" ]]; then
fi fi
fi fi
if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
return return
fi fi

View file

@ -16,7 +16,7 @@ Provided aliases:
email address). Then the OTP key needs to be pasted, followed by a CTRL+D character email address). Then the OTP key needs to be pasted, followed by a CTRL+D character
inserted on an empty line. inserted on an empty line.
- `ot`: generates a MFA code based on the given key and copies it to the clipboard - `ot`: generates a MFA code based on the given key and copies it to the clipboard
(on Linux it relies on xsel, on MacOS X it uses pbcopy instead). (on Linux it relies on xsel, on MacOS X it uses pbcopy instead).
The plugin uses `$HOME/.otp` to store its internal files. The plugin uses `$HOME/.otp` to store its internal files.

View file

@ -79,7 +79,7 @@ _id_names() {
local app_list local app_list
app_list=`pm2 list -m` app_list=`pm2 list -m`
local -a names ids local -a names ids
names=(`echo $app_list | grep '+---' | awk '{print $2}'`) names=(`echo $app_list | grep '+---' | awk '{print $2}'`)
ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`) ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`)

View file

@ -1,6 +1,6 @@
# Poetry Environment Plugin # Poetry Environment Plugin
This plugin automatically changes poetry environment when you cd into or out of the project directory. This plugin automatically changes poetry environment when you cd into or out of the project directory.
Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment
To use it, add `poetry-env` to the plugins array in your zshrc file: To use it, add `poetry-env` to the plugins array in your zshrc file:

View file

@ -18,7 +18,7 @@ _1st_arguments=(
'config:Get and set options' 'config:Get and set options'
'version:Show the roswell version information' 'version:Show the roswell version information'
"help:Use \"ros help [command]\" for more information about a command."$'\n\t\t'"Use \"ros help [topic]\" for more information about the topic." "help:Use \"ros help [command]\" for more information about a command."$'\n\t\t'"Use \"ros help [topic]\" for more information about the topic."
) )
#local expl #local expl

View file

@ -4,7 +4,7 @@
# AUTHOR: Mirko Caserta (mirko.caserta@gmail.com) # AUTHOR: Mirko Caserta (mirko.caserta@gmail.com)
# VERSION: 1.0.2 # VERSION: 1.0.2
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# aliases - mnemonic: prefix is 'sb' # aliases - mnemonic: prefix is 'sb'
alias sbc='sbt compile' alias sbc='sbt compile'
alias sbcc='sbt clean compile' alias sbcc='sbt clean compile'

View file

@ -8,7 +8,7 @@ if [[ "$TERM" == screen* ]]; then
_GET_HOST='echo $HOST | sed "s/\..*//"' _GET_HOST='echo $HOST | sed "s/\..*//"'
fi fi
# use the current user as the prefix of the current tab title # use the current user as the prefix of the current tab title
TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"' TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"'
# when at the shell prompt, show a truncated version of the current path (with # when at the shell prompt, show a truncated version of the current path (with
# standard ~ replacement) as the rest of the title. # standard ~ replacement) as the rest of the title.

View file

@ -1,5 +1,5 @@
########################### ###########################
# Settings # Settings
# These can be overwritten any time. # These can be overwritten any time.
# If they are not set yet, they will be # If they are not set yet, they will be

View file

@ -1,7 +1,7 @@
# Systemadmin plugin # Systemadmin plugin
This plugin adds a series of aliases and functions which make a System Administrator's life easier. This plugin adds a series of aliases and functions which make a System Administrator's life easier.
To use it, add `systemadmin` to the plugins array in your zshrc file: To use it, add `systemadmin` to the plugins array in your zshrc file:
```zsh ```zsh

View file

@ -1,6 +1,6 @@
# Thor plugin # Thor plugin
This plugin adds completion for [Thor](http://whatisthor.com/), This plugin adds completion for [Thor](http://whatisthor.com/),
a ruby toolkit for building powerful command-line interfaces. a ruby toolkit for building powerful command-line interfaces.
To use it, add `thor` to the plugins array in your zshrc file: To use it, add `thor` to the plugins array in your zshrc file:

View file

@ -10,7 +10,7 @@ plugins=(... ufw)
Some of the commands include: Some of the commands include:
* `allow <port>/<optional: protocol>` add an allow rule * `allow <port>/<optional: protocol>` add an allow rule
* `default` set default policy * `default` set default policy
* `delete <port>/<optional: protocol>` delete RULE * `delete <port>/<optional: protocol>` delete RULE
* `deny <port>/<optional: protocol>` add deny rule * `deny <port>/<optional: protocol>` add deny rule

View file

@ -1,6 +1,6 @@
This plugin prompts the status of the Vagrant VMs. It supports single-host and This plugin prompts the status of the Vagrant VMs. It supports single-host and
multi-host configurations as well. multi-host configurations as well.
Look inside the source for documentation about custom variables. Look inside the source for documentation about custom variables.
Alberto Re <alberto.re@gmail.com> Alberto Re <alberto.re@gmail.com>

View file

@ -55,7 +55,7 @@ INSERT_MODE_INDICATOR="%F{yellow}+%f"
### Adding mode indicators to your prompt ### Adding mode indicators to your prompt
`Vi-mode` by default will add mode indicators to `RPROMPT` **unless** that is defined by `Vi-mode` by default will add mode indicators to `RPROMPT` **unless** that is defined by
a preceding plugin. a preceding plugin.
If `PROMPT` or `RPROMPT` is not defined to your liking, you can add mode info manually. The `vi_mode_prompt_info` function is available to insert mode indicator information. If `PROMPT` or `RPROMPT` is not defined to your liking, you can add mode info manually. The `vi_mode_prompt_info` function is available to insert mode indicator information.

View file

@ -3,7 +3,7 @@
The plugin presents a function called `callvim` whose usage is: The plugin presents a function called `callvim` whose usage is:
usage: callvim [-b cmd] [-a cmd] [file ... fileN] usage: callvim [-b cmd] [-a cmd] [file ... fileN]
-b cmd Run this command in GVIM before editing the first file -b cmd Run this command in GVIM before editing the first file
-a cmd Run this command in GVIM after editing the first file -a cmd Run this command in GVIM after editing the first file
file The file to edit file The file to edit

View file

@ -2,7 +2,7 @@
# See README.md # See README.md
# #
# Derek Wyatt (derek@{myfirstnamemylastname}.org # Derek Wyatt (derek@{myfirstnamemylastname}.org
# #
function callvim { function callvim {
if [[ $# == 0 ]]; then if [[ $# == 0 ]]; then

View file

@ -52,7 +52,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
else else
ENV_NAME="" ENV_NAME=""
fi fi
if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then
# We've just left the repo, deactivate the environment # We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically # Note: this only happens if the virtualenv was activated automatically

View file

@ -153,7 +153,7 @@ wd ..
wd ... wd ...
``` ```
This is a wrapper for the zsh's `dirs` function. This is a wrapper for the zsh's `dirs` function.
_You might need to add `setopt AUTO_PUSHD` to your `.zshrc` if you are not using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)._ _You might need to add `setopt AUTO_PUSHD` to your `.zshrc` if you are not using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)._
* Remove warp point: * Remove warp point:

View file

@ -77,7 +77,7 @@ function _wd() {
# complete sub directories from the warp point # complete sub directories from the warp point
_path_files -W "(${points[$target]})" -/ && ret=0 _path_files -W "(${points[$target]})" -/ && ret=0
fi fi
# don't complete anything if warp point is not valid # don't complete anything if warp point is not valid
;; ;;
esac esac

View file

@ -188,7 +188,7 @@ Add a backslash to the end of the last line add `'zsh-z'` to the list, e.g.,
Then relaunch `zsh`. Then relaunch `zsh`.
### For [zcomet](https://github.com/agkozak/zcomet) users ### For [zcomet](https://github.com/agkozak/zcomet) users
Simply add Simply add
zcomet load agkozak/zsh-z zcomet load agkozak/zsh-z

View file

@ -5,10 +5,10 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
# Text to display if the branch is dirty # Text to display if the branch is dirty
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
# Text to display if the branch is clean # Text to display if the branch is clean
ZSH_THEME_GIT_PROMPT_CLEAN="" ZSH_THEME_GIT_PROMPT_CLEAN=""
# Colors vary depending on time lapsed. # Colors vary depending on time lapsed.
ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}" ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
@ -36,7 +36,7 @@ function rvm_gemset() {
GEMSET=`rvm gemset list | grep '=>' | cut -b4-` GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
if [[ -n $GEMSET ]]; then if [[ -n $GEMSET ]]; then
echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
fi fi
fi fi
} }
@ -52,12 +52,12 @@ function git_time_since_commit() {
# Totals # Totals
MINUTES=$((seconds_since_last_commit / 60)) MINUTES=$((seconds_since_last_commit / 60))
HOURS=$((seconds_since_last_commit/3600)) HOURS=$((seconds_since_last_commit/3600))
# Sub-hours and sub-minutes # Sub-hours and sub-minutes
DAYS=$((seconds_since_last_commit / 86400)) DAYS=$((seconds_since_last_commit / 86400))
SUB_HOURS=$((HOURS % 24)) SUB_HOURS=$((HOURS % 24))
SUB_MINUTES=$((MINUTES % 60)) SUB_MINUTES=$((MINUTES % 60))
if [[ -n $(git status -s 2> /dev/null) ]]; then if [[ -n $(git status -s 2> /dev/null) ]]; then
if [ "$MINUTES" -gt 30 ]; then if [ "$MINUTES" -gt 30 ]; then
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"

View file

@ -79,7 +79,7 @@ ps1_command_tip() {
command wget -qO- https://www.commandlinefu.com/commands/random/plaintext command wget -qO- https://www.commandlinefu.com/commands/random/plaintext
elif (( ${+commands[curl]} )); then elif (( ${+commands[curl]} )); then
command curl -fsL https://www.commandlinefu.com/commands/random/plaintext command curl -fsL https://www.commandlinefu.com/commands/random/plaintext
fi fi
} | sed '1d;/^$/d' } | sed '1d;/^$/d'
} }

View file

@ -111,7 +111,7 @@ prompt_git() {
dirty=$(parse_git_dirty) dirty=$(parse_git_dirty)
ref=$(git symbolic-ref HEAD 2> /dev/null) || \ ref=$(git symbolic-ref HEAD 2> /dev/null) || \
ref="◈ $(git describe --exact-match --tags HEAD 2> /dev/null)" || \ ref="◈ $(git describe --exact-match --tags HEAD 2> /dev/null)" || \
ref="➦ $(git rev-parse --short HEAD 2> /dev/null)" ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
if [[ -n $dirty ]]; then if [[ -n $dirty ]]; then
prompt_segment yellow black prompt_segment yellow black
else else

View file

@ -15,7 +15,7 @@ __RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(g
if [[ -z $RPROMPT ]]; then if [[ -z $RPROMPT ]]; then
RPROMPT=$__RPROMPT RPROMPT=$__RPROMPT
else else
RPROMPT="${RPROMPT} ${__RPROMPT}" RPROMPT="${RPROMPT} ${__RPROMPT}"
fi fi
function _user_host() { function _user_host() {

View file

@ -1,15 +1,15 @@
# CRUNCH - created from Steve Eley's cat waxing. # CRUNCH - created from Steve Eley's cat waxing.
# Initially hacked from the Dallas theme. Thanks, Dallas Reedy. # Initially hacked from the Dallas theme. Thanks, Dallas Reedy.
# #
# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine, # This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine,
# and eschews the standard space-consuming user and hostname info. Instead, only the # and eschews the standard space-consuming user and hostname info. Instead, only the
# things that vary in my own workflow are shown: # things that vary in my own workflow are shown:
# #
# * The time (not the date) # * The time (not the date)
# * The RVM version and gemset (omitting the 'ruby' name if it's MRI) # * The RVM version and gemset (omitting the 'ruby' name if it's MRI)
# * The current directory # * The current directory
# * The Git branch and its 'dirty' state # * The Git branch and its 'dirty' state
# #
# Colors are at the top so you can mess with those separately if you like. # Colors are at the top so you can mess with those separately if you like.
# For the most part I stuck with Dallas's. # For the most part I stuck with Dallas's.

View file

@ -1,5 +1,5 @@
# RVM settings # RVM settings
if [[ -s ~/.rvm/scripts/rvm ]] ; then if [[ -s ~/.rvm/scripts/rvm ]] ; then
RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1" RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
else else
if which rbenv &> /dev/null; then if which rbenv &> /dev/null; then

View file

@ -11,7 +11,7 @@
# #
# There are pre-defined different emoji sets to choose from, e.g.: # There are pre-defined different emoji sets to choose from, e.g.:
# emoji, stellar, floral, zodiac, love (see emotty plugin). # emoji, stellar, floral, zodiac, love (see emotty plugin).
# #
# To choose a different emotty set than the default (emoji) # To choose a different emotty set than the default (emoji)
# % export emotty_set=nature # % export emotty_set=nature
# #
@ -95,7 +95,7 @@ zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}"
# %(k|f) reset (back|fore)ground color # %(k|f) reset (back|fore)ground color
zstyle ':vcs_info:*' max-exports 3 zstyle ':vcs_info:*' max-exports 3
zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' '' zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' ''
zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]"
zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]" zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]"
red_if_root="%(!.%F{red}.)" red_if_root="%(!.%F{red}.)"

View file

@ -8,7 +8,7 @@
# - prefix to detect docker containers or chroot # - prefix to detect docker containers or chroot
# - git plugin to display current branch and status # - git plugin to display current branch and status
# git plugin # git plugin
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}(" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
@ -35,7 +35,7 @@ if [[ -n "$SSH_CONNECTION" ]]; then
ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} " ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} "
# use red color to highlight a remote connection # use red color to highlight a remote connection
ZSH_ESSEMBEH_COLOR="red" ZSH_ESSEMBEH_COLOR="red"
elif [[ -r /etc/debian_chroot ]]; then elif [[ -r /etc/debian_chroot ]]; then
# prefix prompt in case of chroot # prefix prompt in case of chroot
ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} " ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} "
elif [[ -r /.dockerenv ]]; then elif [[ -r /.dockerenv ]]; then

View file

@ -15,7 +15,7 @@ function josh_prompt {
branch_size=${#branch} branch_size=${#branch}
ruby_size=${#ruby_version} ruby_size=${#ruby_version}
user_machine_size=${#${(%):-%n@%m-}} user_machine_size=${#${(%):-%n@%m-}}
if [[ ${#branch} -eq 0 ]] if [[ ${#branch} -eq 0 ]]
then (( ruby_size = ruby_size + 1 )) then (( ruby_size = ruby_size + 1 ))
else else
@ -24,15 +24,15 @@ function josh_prompt {
(( branch_size = branch_size + 2 )) (( branch_size = branch_size + 2 ))
fi fi
fi fi
(( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) )) (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
while [ ${#prompt} -lt $spare_width ]; do while [ ${#prompt} -lt $spare_width ]; do
prompt=" $prompt" prompt=" $prompt"
done done
prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)" prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)"
echo $prompt echo $prompt
} }

View file

@ -3,10 +3,10 @@
# Grab the current date (%W) and time (%t): # Grab the current date (%W) and time (%t):
JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}" JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
# Grab the current machine name # Grab the current machine name
JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}" JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}"
# Grab the current username # Grab the current username
JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}" JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"
# Grab the current filepath, use shortcuts: ~/Desktop # Grab the current filepath, use shortcuts: ~/Desktop

View file

@ -15,7 +15,7 @@
# To customize symbols (e.g MLH_AT_SYMBOL), simply set them as environment variables # To customize symbols (e.g MLH_AT_SYMBOL), simply set them as environment variables
# for example in your ~/.zshrc file, like this: # for example in your ~/.zshrc file, like this:
# MLH_AT_SYMBOL=" at " # MLH_AT_SYMBOL=" at "
# #
# Settings *must* be set before sourcing oh-my-zsh.sh the .zshrc file. # Settings *must* be set before sourcing oh-my-zsh.sh the .zshrc file.
# #
# To easily discover colors and their codes, type `spectrum_ls` in the terminal # To easily discover colors and their codes, type `spectrum_ls` in the terminal

View file

@ -1,6 +1,6 @@
function my_git_prompt() { function my_git_prompt() {
tester=$(git rev-parse --git-dir 2> /dev/null) || return tester=$(git rev-parse --git-dir 2> /dev/null) || return
INDEX=$(git status --porcelain 2> /dev/null) INDEX=$(git status --porcelain 2> /dev/null)
STATUS="" STATUS=""

View file

@ -1,4 +1,4 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" #local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
setopt promptsubst setopt promptsubst

View file

@ -5,9 +5,9 @@
# - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist) # - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
# - Open Terminal preferences. Go to Settings -> Text -> More # - Open Terminal preferences. Go to Settings -> Text -> More
# - Change default colours to your liking. # - Change default colours to your liking.
# #
# Here are the colours from Textmate's Monokai theme: # Here are the colours from Textmate's Monokai theme:
# #
# Black: 0, 0, 0 # Black: 0, 0, 0
# Red: 229, 34, 34 # Red: 229, 34, 34
# Green: 166, 227, 45 # Green: 166, 227, 45
@ -28,7 +28,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}' RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
# $(ruby_prompt_info) # $(ruby_prompt_info)
# local time, color coded by last return code # local time, color coded by last return code
time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}" time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
@ -53,7 +53,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
# More symbols to choose from: # More symbols to choose from:
# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷ # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵ ⩶ ⨠ # ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵ ⩶ ⨠
# ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟ ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ # ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟ ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ
# Determine if we are using a gemset. # Determine if we are using a gemset.
@ -61,7 +61,7 @@ function rvm_gemset() {
GEMSET=`rvm gemset list | grep '=>' | cut -b4-` GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
if [[ -n $GEMSET ]]; then if [[ -n $GEMSET ]]; then
echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
fi fi
} }
# Determine the time since last commit. If branch is clean, # Determine the time since last commit. If branch is clean,
@ -76,12 +76,12 @@ function git_time_since_commit() {
# Totals # Totals
MINUTES=$((seconds_since_last_commit / 60)) MINUTES=$((seconds_since_last_commit / 60))
HOURS=$((seconds_since_last_commit/3600)) HOURS=$((seconds_since_last_commit/3600))
# Sub-hours and sub-minutes # Sub-hours and sub-minutes
DAYS=$((seconds_since_last_commit / 86400)) DAYS=$((seconds_since_last_commit / 86400))
SUB_HOURS=$((HOURS % 24)) SUB_HOURS=$((HOURS % 24))
SUB_MINUTES=$((MINUTES % 60)) SUB_MINUTES=$((MINUTES % 60))
if [[ -n $(git status -s 2> /dev/null) ]]; then if [[ -n $(git status -s 2> /dev/null) ]]; then
if [ "$MINUTES" -gt 30 ]; then if [ "$MINUTES" -gt 30 ]; then
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"