mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-04-24 04:29:25 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Gaetan Semet
commit
de8d949325
27 changed files with 498 additions and 93 deletions
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
alias ara='arc amend'
|
||||
alias arb='arc branch'
|
||||
alias arc='arc cover'
|
||||
alias arco='arc cover'
|
||||
alias arci='arc commit'
|
||||
|
||||
alias ard='arc diff'
|
||||
|
|
@ -18,4 +18,4 @@ alias arh='arc help'
|
|||
alias arl='arc land'
|
||||
alias arli='arc lint'
|
||||
alias arls='arc list'
|
||||
alias arp='arc patch'
|
||||
alias arpa='arc patch'
|
||||
|
|
|
|||
|
|
@ -17,7 +17,12 @@ function branch_prompt_info() {
|
|||
# Mercurial repository
|
||||
if [[ -d "${current_dir}/.hg" ]]
|
||||
then
|
||||
echo '☿' $(<"$current_dir/.hg/branch")
|
||||
if [[ -f "$current_dir/.hg/branch" ]]
|
||||
then
|
||||
echo '☿' $(<"$current_dir/.hg/branch")
|
||||
else
|
||||
echo '☿ default'
|
||||
fi
|
||||
return;
|
||||
fi
|
||||
# Defines path as parent directory and keeps looking for :)
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ bundle_install() {
|
|||
if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
|
||||
if [[ "$OSTYPE" = darwin* ]]
|
||||
then
|
||||
local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
|
||||
local cores_num="$(sysctl -n hw.ncpu)"
|
||||
else
|
||||
local cores_num="$(nproc)"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,12 +1,28 @@
|
|||
#!/bin/sh
|
||||
|
||||
# get list of available X windows.
|
||||
x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
|
||||
_emacsfun()
|
||||
{
|
||||
# get list of available X windows.
|
||||
x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
|
||||
|
||||
if [ -z "$x" ] || [ "$x" = "nil" ] ;then
|
||||
# Create one if there is no X window yet.
|
||||
emacsclient --alternate-editor "" --create-frame "$@"
|
||||
if [ -z "$x" ] || [ "$x" = "nil" ] ;then
|
||||
# Create one if there is no X window yet.
|
||||
emacsclient --alternate-editor "" --create-frame "$@"
|
||||
else
|
||||
# prevent creating another X frame if there is at least one present.
|
||||
emacsclient --alternate-editor "" "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
|
||||
# If the second argument is - then write stdin to a tempfile and open the
|
||||
# tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
|
||||
if [ "$#" -ge "2" -a "$2" = "-" ]
|
||||
then
|
||||
tempfile="$(mktemp emacs-stdin-$USER.XXXXXXX --tmpdir)"
|
||||
cat - > "$tempfile"
|
||||
_emacsfun --no-wait $tempfile
|
||||
else
|
||||
# prevent creating another X frame if there is at least one present.
|
||||
emacsclient --alternate-editor "" "$@"
|
||||
_emacsfun "$@"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ alias gdw='git diff --word-diff'
|
|||
alias gf='git fetch'
|
||||
alias gfa='git fetch --all --prune'
|
||||
function gfg() { git ls-files | grep $@ }
|
||||
compdef gfg=grep
|
||||
compdef _grep gfg
|
||||
alias gfo='git fetch origin'
|
||||
|
||||
alias gg='git gui citool'
|
||||
|
|
@ -199,7 +199,7 @@ alias gsps='git show --pretty=short --show-signature'
|
|||
alias gsr='git svn rebase'
|
||||
alias gss='git status -s'
|
||||
alias gst='git status'
|
||||
alias gsta='git stash'
|
||||
alias gsta='git stash save'
|
||||
alias gstaa='git stash apply'
|
||||
alias gstd='git stash drop'
|
||||
alias gstl='git stash list'
|
||||
|
|
|
|||
|
|
@ -1,41 +1,85 @@
|
|||
# author: Peter Eisentraut
|
||||
# source: https://gist.github.com/petere/10307599
|
||||
# compdef kitchen
|
||||
#compdef kitchen
|
||||
# ------------------------------------------------------------------------------
|
||||
# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# * Neither the name of the zsh-users nor the
|
||||
# names of its contributors may be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
|
||||
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# ------------------------------------------------------------------------------
|
||||
# Description
|
||||
# -----------
|
||||
#
|
||||
# Completion script for Test Kitchen (http://kitchen.ci/).
|
||||
#
|
||||
# ------------------------------------------------------------------------------
|
||||
# Authors
|
||||
# -------
|
||||
#
|
||||
# * Peter Eisentraut (https://github.com/petere)
|
||||
#
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
|
||||
_kitchen() {
|
||||
local curcontext="$curcontext" state line
|
||||
typeset -A opt_args
|
||||
local curcontext="$curcontext" state line
|
||||
typeset -A opt_args
|
||||
|
||||
_arguments '1: :->cmds'\
|
||||
'2: :->args'
|
||||
_arguments '1: :->cmds'\
|
||||
'2: :->args'
|
||||
|
||||
case $state in
|
||||
cmds)
|
||||
_arguments "1:Commands:(console converge create destroy diagnose driver help init list login setup test verify version)"
|
||||
;;
|
||||
args)
|
||||
case $line[1] in
|
||||
converge|create|destroy|diagnose|list|setup|test|verify)
|
||||
compadd "$@" all
|
||||
_kitchen_instances
|
||||
;;
|
||||
login)
|
||||
_kitchen_instances
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case $state in
|
||||
cmds)
|
||||
_kitchen_commands
|
||||
;;
|
||||
args)
|
||||
case $line[1] in
|
||||
converge|create|destroy|diagnose|list|setup|test|verify)
|
||||
compadd 'all'
|
||||
_kitchen_instances
|
||||
;;
|
||||
login)
|
||||
_kitchen_instances
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
_kitchen_commands() {
|
||||
local commands
|
||||
|
||||
commands=("${(@f)$(_call_program commands $service help | sed -n 's/^ kitchen \([[:alpha:]]*\) [ [].*# \(.*\)$/\1:\2/p')}")
|
||||
_describe -t commands 'kitchen commands' commands
|
||||
}
|
||||
|
||||
_kitchen_instances() {
|
||||
if [[ $_kitchen_instances_cache_dir != $PWD ]]; then
|
||||
unset _kitchen_instances_cache
|
||||
fi
|
||||
if [[ ${+_kitchen_instances_cache} -eq 0 ]]; then
|
||||
_kitchen_instances_cache=(${(f)"$(bundle exec kitchen list -b 2>/dev/null || kitchen list -b 2>/dev/null)"})
|
||||
_kitchen_instances_cache_dir=$PWD
|
||||
fi
|
||||
compadd -a _kitchen_instances_cache
|
||||
if [[ $_kitchen_instances_cache_dir != $PWD ]]; then
|
||||
unset _kitchen_instances_cache
|
||||
fi
|
||||
if [[ ${+_kitchen_instances_cache} -eq 0 ]]; then
|
||||
_kitchen_instances_cache=(${(f)"$(_call_program instances $service list -b 2>/dev/null)"})
|
||||
_kitchen_instances_cache_dir=$PWD
|
||||
fi
|
||||
_wanted instances expl 'instance' compadd -a _kitchen_instances_cache
|
||||
}
|
||||
|
||||
_kitchen "$@"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
# You can override the path to knife.rb and your cookbooks by setting
|
||||
# KNIFE_CONF_PATH=/path/to/my/.chef/knife.rb
|
||||
# KNIFE_COOKBOOK_PATH=/path/to/my/chef/cookbooks
|
||||
# If you want your local cookbooks path to be calculated relative to where you are then
|
||||
# set the below option
|
||||
# KNIFE_RELATIVE_PATH=true
|
||||
# Read around where these are used for more detail.
|
||||
|
||||
# These flags should be available everywhere according to man knife
|
||||
|
|
@ -119,7 +122,19 @@ _knife() {
|
|||
_arguments '4:Subsubsubcommands:($(_chef_$words[2]_$words[3]s_remote))'
|
||||
;;
|
||||
file)
|
||||
_arguments '*:file or directory:_files -g "*.(rb|json)"'
|
||||
case $words[2] in
|
||||
environment)
|
||||
_arguments '*:files:_path_files -g "*.(rb|json)" -W "$(_chef_root)/environments"'
|
||||
;;
|
||||
node)
|
||||
_arguments '*:files:_path_files -g "*.(rb|json)" -W "$(_chef_root)/nodes"'
|
||||
;;
|
||||
role)
|
||||
_arguments '*:files:_path_files -g "*.(rb|json)" -W "$(_chef_root)/roles"'
|
||||
;;
|
||||
*)
|
||||
_arguments '*:Subsubcommands:($(_knife_options3))'
|
||||
esac
|
||||
;;
|
||||
list)
|
||||
compadd -a "$@" knife_general_flags
|
||||
|
|
@ -132,11 +147,22 @@ _knife() {
|
|||
if (( versioncomp > 0 )); then
|
||||
compadd "$@" attributes definitions files libraries providers recipes resources templates
|
||||
else
|
||||
_arguments '*:Subsubcommands:($(_knife_options2))'
|
||||
case $words[5] in
|
||||
file)
|
||||
_arguments '*:directory:_path_files -/ -W "$(_chef_root)/data_bags" -qS \ '
|
||||
;;
|
||||
*) _arguments '*:Subsubcommands:($(_knife_options2))'
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
knifesubcmd5)
|
||||
_arguments '*:Subsubcommands:($(_knife_options3))'
|
||||
case $words[5] in
|
||||
file)
|
||||
_arguments '*:files:_path_files -g "*.json" -W "$(_chef_root)/data_bags/$words[6]"'
|
||||
;;
|
||||
*)
|
||||
_arguments '*:Subsubcommands:($(_knife_options3))'
|
||||
esac
|
||||
esac
|
||||
}
|
||||
|
||||
|
|
@ -184,12 +210,15 @@ _chef_environments_remote() {
|
|||
|
||||
# The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
|
||||
_chef_cookbooks_local() {
|
||||
|
||||
local knife_rb=${KNIFE_CONF_PATH:-${HOME}/.chef/knife.rb}
|
||||
if [ -f ./.chef/knife.rb ]; then
|
||||
knife_rb="./.chef/knife.rb"
|
||||
if [ $KNIFE_RELATIVE_PATH ]; then
|
||||
local cookbook_path="$(_chef_root)/cookbooks"
|
||||
else
|
||||
local knife_rb=${KNIFE_CONF_PATH:-${HOME}/.chef/knife.rb}
|
||||
if [ -f ./.chef/knife.rb ]; then
|
||||
knife_rb="./.chef/knife.rb"
|
||||
fi
|
||||
local cookbook_path=${KNIFE_COOKBOOK_PATH:-$(grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' )}
|
||||
fi
|
||||
local cookbook_path=${KNIFE_COOKBOOK_PATH:-$(grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' )}
|
||||
(for i in $cookbook_path; do ls $i; done)
|
||||
}
|
||||
|
||||
|
|
@ -198,4 +227,15 @@ _cookbook_versions() {
|
|||
(knife cookbook show $words[4] | grep -v $words[4] | grep -v -E '\]|\[|\{|\}' | sed 's/ //g' | sed 's/"//g')
|
||||
}
|
||||
|
||||
# Searches up from current directory to find the closest folder that has a .chef folder
|
||||
# Useful for the knife upload/from file commands
|
||||
_chef_root () {
|
||||
directory="$PWD"
|
||||
while [ $directory != '/' ]
|
||||
do
|
||||
test -e "$directory/.chef" && echo "$directory" && return
|
||||
directory="${directory:h}"
|
||||
done
|
||||
}
|
||||
|
||||
_knife "$@"
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ plugins=(... mvn)
|
|||
| `mvncie` | `mvn clean install eclipse:eclipse` |
|
||||
| `mvnci` | `mvn clean install` |
|
||||
| `mvncist` | `mvn clean install -DskipTests` |
|
||||
| `mvncisto` | `mvn clean install -DskipTests --offline` |
|
||||
| `mvne` | `mvn eclipse:eclipse` |
|
||||
| `mvnd` | `mvn deploy` |
|
||||
| `mvnp` | `mvn package` |
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ mvn-color()
|
|||
alias mvncie='mvn clean install eclipse:eclipse'
|
||||
alias mvnci='mvn clean install'
|
||||
alias mvncist='mvn clean install -DskipTests'
|
||||
alias mvncisto='mvn clean install -DskipTests --offline'
|
||||
alias mvne='mvn eclipse:eclipse'
|
||||
alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
|
||||
alias mvnd='mvn deploy'
|
||||
|
|
|
|||
27
plugins/osx/README.md
Normal file
27
plugins/osx/README.md
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# OSX plugin
|
||||
|
||||
## Description
|
||||
|
||||
This plugin provides a few utilities to make it more enjoyable on OSX.
|
||||
|
||||
To start using it, add the `osx` plugin to your plugins array in `~/.zshrc`:
|
||||
|
||||
```zsh
|
||||
plugins=(... osx)
|
||||
```
|
||||
|
||||
Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
|
||||
## Commands
|
||||
|
||||
| Command | Description |
|
||||
|:--------------|:-----------------------------------------------|
|
||||
| `tab` | Open the current directory in a new tab |
|
||||
| `ofd` | Open the current directory in a Finder window |
|
||||
| `pfd` | Return the path of the frontmost Finder window |
|
||||
| `pfs` | Return the current Finder selection |
|
||||
| `cdf` | `cd` to the current Finder directory |
|
||||
| `pushdf` | `pushd` to the current Finder directory |
|
||||
| `quick-look` | Quick-Look a specified file |
|
||||
| `man-preview` | Open a specified man page in Preview app |
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#compdef man-preview
|
||||
#autoload
|
||||
|
||||
_man
|
||||
|
||||
|
|
@ -1,9 +1,5 @@
|
|||
# ------------------------------------------------------------------------------
|
||||
# FILE: osx.plugin.zsh
|
||||
# DESCRIPTION: oh-my-zsh plugin file.
|
||||
# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com)
|
||||
# VERSION: 1.1.0
|
||||
# ------------------------------------------------------------------------------
|
||||
# Open the current directory in a Finder window
|
||||
alias ofd='open_command $PWD'
|
||||
|
||||
function _omz_osx_get_frontmost_app() {
|
||||
local the_app=$(
|
||||
|
|
@ -179,6 +175,7 @@ function quick-look() {
|
|||
function man-preview() {
|
||||
man -t "$@" | open -f -a Preview
|
||||
}
|
||||
compdef _man man-preview
|
||||
|
||||
function vncviewer() {
|
||||
open vnc://$@
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ function _rails_command () {
|
|||
function _rake_command () {
|
||||
if [ -e "bin/rake" ]; then
|
||||
bin/rake $@
|
||||
elif type bundle &> /dev/null && [ -e "Gemfile" ]; then
|
||||
bundle exec rake $@
|
||||
else
|
||||
command rake $@
|
||||
fi
|
||||
|
|
|
|||
14
plugins/react-native/README.md
Normal file
14
plugins/react-native/README.md
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# React Native
|
||||
|
||||
**Maintainer:** [BilalBudhani](https://github.com/BilalBudhani)
|
||||
|
||||
### List of Aliases
|
||||
|
||||
Alias | React Native command
|
||||
------|---------------------
|
||||
**rnand** | *react-native run-android*
|
||||
**rnios** | *react-native run-ios*
|
||||
**rnios4s** | *react-native run-ios --simulator "iPhone 4s"*
|
||||
**rnios5** | *react-native run-ios --simulator "iPhone 5"*
|
||||
**rnios5s** | *react-native run-ios --simulator "iPhone 5s"*
|
||||
|
||||
23
plugins/react-native/_react-native
Normal file
23
plugins/react-native/_react-native
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#compdef react-native
|
||||
#autoload
|
||||
|
||||
local -a _1st_arguments
|
||||
_1st_arguments=(
|
||||
'start:starts the webserver'
|
||||
'bundle:builds the javascript bundle for offline use'
|
||||
'new-library:generates a native library bridge'
|
||||
'android:generates an Android project for your app'
|
||||
'run-android:builds your app and starts it on a connected Android emulator or device'
|
||||
'upgrade:upgrade your apps template files to the latest version; run this after updating the react-native version in your package.json and running npm install'
|
||||
)
|
||||
|
||||
|
||||
_arguments \
|
||||
'(--version)--version[show version]' \
|
||||
'(--help)--help[show help]' \
|
||||
'*:: :->subcmds' && return 0
|
||||
|
||||
if (( CURRENT == 1 )); then
|
||||
_describe -t commands "react-native subcommand" _1st_arguments
|
||||
return
|
||||
fi
|
||||
6
plugins/react-native/react-native.plugin.zsh
Normal file
6
plugins/react-native/react-native.plugin.zsh
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
alias rnand='react-native run-android'
|
||||
alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
|
||||
alias rnios5='react-native run-ios --simulator "iPhone 5"'
|
||||
alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
|
||||
alias rnios='react-native run-ios'
|
||||
|
||||
191
plugins/rust/_rust
Normal file
191
plugins/rust/_rust
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
#compdef rustc
|
||||
|
||||
local -a _rustc_opts_switches _rustc_opts_lint _rustc_opts_debug
|
||||
|
||||
typeset -A opt_args
|
||||
|
||||
_rustc_debuginfo_levels=(
|
||||
"0[no debug info]"
|
||||
"1[line-tables only (for stacktraces and breakpoints)]"
|
||||
"2[full debug info with variable and type information (same as -g)]"
|
||||
)
|
||||
|
||||
_rustc_crate_types=(
|
||||
'bin'
|
||||
'lib'
|
||||
'rlib'
|
||||
'dylib'
|
||||
'staticlib'
|
||||
)
|
||||
|
||||
_rustc_emit_types=(
|
||||
'asm'
|
||||
'bc'
|
||||
'ir'
|
||||
'obj'
|
||||
'link'
|
||||
)
|
||||
_rustc_pretty_types=(
|
||||
'normal[un-annotated source]'
|
||||
'expanded[crates expanded]'
|
||||
'typed[crates expanded, with type annotations]'
|
||||
'identified[fully parenthesized, AST nodes and blocks with IDs]'
|
||||
'flowgraph=[graphviz formatted flowgraph for node]:NODEID:'
|
||||
)
|
||||
_rustc_color_types=(
|
||||
'auto[colorize, if output goes to a tty (default)]'
|
||||
'always[always colorize output]'
|
||||
'never[never colorize output]'
|
||||
)
|
||||
|
||||
_rustc_opts_vals=(
|
||||
--crate-name='[Specify the name of the crate being built]'
|
||||
--crate-type='[Comma separated list of types of crates for the compiler to emit]:TYPES:_values -s "," "Crate types" "$_rustc_crate_types[@]"'
|
||||
--emit='[Comma separated list of types of output for the compiler to emit]:TYPES:_values -s "," "Emit Targets" "$_rustc_emit_types[@]"'
|
||||
--debuginfo='[Emit DWARF debug info to the objects created]:LEVEL:_values "Debug Levels" "$_rustc_debuginfo_levels[@]"'
|
||||
--dep-info='[Output dependency info to <filename> after compiling]::FILE:_files -/'
|
||||
--sysroot='[Override the system root]:PATH:_files -/'
|
||||
--cfg='[Configure the compilation environment]:SPEC:'
|
||||
--out-dir='[Write output to compiler-chosen filename in <dir>. Ignored if -o is specified. (default the current directory)]:DIR:_files -/'
|
||||
-o'[Write output to <filename>. Ignored if more than one --emit is specified.]:FILENAME:_files'
|
||||
--opt-level='[Optimize with possible levels 0-3]:LEVEL:(0 1 2 3)'
|
||||
--pretty='[Pretty-print the input instead of compiling]::TYPE:_values "TYPES" "$_rustc_pretty_types[@]"'
|
||||
-L'[Add a directory to the library search path]:DIR:_files -/'
|
||||
--target='[Target triple cpu-manufacturer-kernel\[-os\] to compile]:TRIPLE:'
|
||||
--color='[Configure coloring of output]:CONF:_values "COLORS" "$_rustc_color_types[@]"'
|
||||
{-v,--version}'[Print version info and exit]::VERBOSE:(verbose)'
|
||||
--explain='[Provide a detailed explanation of an error message]:OPT:'
|
||||
--extern'[Specify where an external rust library is located]:ARG:'
|
||||
)
|
||||
|
||||
_rustc_opts_switches=(
|
||||
-g'[Equivalent to --debuginfo=2]'
|
||||
{-h,--help}'[Display this message]'
|
||||
--no-analysis'[Parse and expand the output, but run no analysis or produce output]'
|
||||
--no-trans'[Run all passes except translation; no output]'
|
||||
-O'[Equivalent to --opt-level=2]'
|
||||
--parse-only'[Parse only; do not compile, assemble, or link]'
|
||||
--print-crate-name'[Output the crate name and exit]'
|
||||
--print-file-name'[Output the file(s) that would be written if compilation continued and exit]'
|
||||
--test'[Build a test harness]'
|
||||
)
|
||||
_rustc_opts_codegen=(
|
||||
'ar=[Path to the archive utility to use when assembling archives.]:BIN:_path_files'
|
||||
'linker=[Path to the linker utility to use when linking libraries, executables, and objects.]:BIN:_path_files'
|
||||
'link-args=[A space-separated list of extra arguments to pass to the linker when the linker is invoked.]:ARGS:'
|
||||
'target-cpu=[Selects a target processor. If the value is "help", then a list of available CPUs is printed.]:CPU:'
|
||||
'target-feature=[A space-separated list of features to enable or disable for the target. A preceding "+" enables a feature while a preceding "-" disables it. Available features can be discovered through target-cpu=help.]:FEATURE:'
|
||||
'passes=[A space-separated list of extra LLVM passes to run. A value of "list" will cause rustc to print all known passes and exit. The passes specified are appended at the end of the normal pass manager.]:LIST:'
|
||||
'llvm-args=[A space-separated list of arguments to pass through to LLVM.]:ARGS:'
|
||||
'save-temps[If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated throughout compilation in the output directory.]'
|
||||
'rpath[If specified, then the rpath value for dynamic libraries will be set in either dynamic library or executable outputs.]'
|
||||
'no-prepopulate-passes[Suppresses pre-population of the LLVM pass manager that is run over the module.]'
|
||||
'no-vectorize-loops[Suppresses running the loop vectorization LLVM pass, regardless of optimization level.]'
|
||||
'no-vectorize-slp[Suppresses running the LLVM SLP vectorization pass, regardless of optimization level.]'
|
||||
'soft-float[Generates software floating point library calls instead of hardware instructions.]'
|
||||
'prefer-dynamic[Prefers dynamic linking to static linking.]'
|
||||
"no-integrated-as[Force usage of an external assembler rather than LLVM's integrated one.]"
|
||||
'no-redzone[disable the use of the redzone]'
|
||||
'relocation-model=[The relocation model to use. (default: pic)]:MODEL:(pic static dynamic-no-pic)'
|
||||
'code-model=[choose the code model to use (llc -code-model for details)]:MODEL:'
|
||||
'metadata=[metadata to mangle symbol names with]:VAL:'
|
||||
'extra-filenames=[extra data to put in each output filename]:VAL:'
|
||||
'codegen-units=[divide crate into N units to optimize in parallel]:N:'
|
||||
'help[Show all codegen options]'
|
||||
)
|
||||
|
||||
_rustc_opts_lint=(
|
||||
'help[Show a list of all lints]'
|
||||
'experimental[detects use of #\[experimental\] items]'
|
||||
'heap-memory[use of any (Box type or @ type) heap memory]'
|
||||
'managed-heap-memory[use of managed (@ type) heap memory]'
|
||||
'missing-doc[detects missing documentation for public members]'
|
||||
'non-uppercase-statics[static constants should have uppercase identifiers]'
|
||||
'owned-heap-memory[use of owned (~ type) heap memory]'
|
||||
'unnecessary-qualification[detects unnecessarily qualified names]'
|
||||
'unsafe-block[usage of an `unsafe` block]'
|
||||
'unstable[detects use of #\[unstable\] items (incl. items with no stability attribute)]'
|
||||
'unused-result[unused result of an expression in a statement]'
|
||||
'variant-size-difference[detects enums with widely varying variant sizes]'
|
||||
'ctypes[proper use of libc types in foreign modules]'
|
||||
'dead-assignment[detect assignments that will never be read]'
|
||||
'dead-code[detect piece of code that will never be used]'
|
||||
'deprecated[detects use of #\[deprecated\] items]'
|
||||
'non-camel-case-types[types, variants and traits should have camel case names]'
|
||||
'non-snake-case[methods, functions, lifetime parameters and modules should have snake case names]'
|
||||
'path-statement[path statements with no effect]'
|
||||
'raw-pointer-deriving[uses of #\[deriving\] with raw pointers are rarely correct]'
|
||||
'type-limits[comparisons made useless by limits of the types involved]'
|
||||
'type-overflow[literal out of range for its type]'
|
||||
'unnecessary-allocation[detects unnecessary allocations that can be eliminated]'
|
||||
'unnecessary-parens[`if`, `match`, `while` and `return` do not need parentheses]'
|
||||
'unreachable-code[detects unreachable code]'
|
||||
'unrecognized-lint[unrecognized lint attribute]'
|
||||
'unsigned-negate[using an unary minus operator on unsigned type]'
|
||||
'unused-attribute[detects attributes that were not used by the compiler]'
|
||||
'unused-imports[imports that are never used]'
|
||||
'unused-must-use[unused result of a type flagged as #\[must_use\]]'
|
||||
"unused-mut[detect mut variables which don't need to be mutable]"
|
||||
'unused-unsafe[unnecessary use of an `unsafe` block]'
|
||||
'unused-variable[detect variables which are not used in any way]'
|
||||
'visible-private-types[detect use of private types in exported type signatures]'
|
||||
'warnings[mass-change the level for lints which produce warnings]'
|
||||
'while-true[suggest using `loop { }` instead of `while true { }`]'
|
||||
'unknown-crate-type[unknown crate type found in #\[crate_type\] directive]'
|
||||
'unknown-features[unknown features found in crate-level #\[feature\] directives]'
|
||||
'bad-style[group of non_camel_case_types, non_snake_case, non_uppercase_statics]'
|
||||
'unused[group of unused_imports, unused_variable, dead_assignment, dead_code, unused_mut, unreachable_code]'
|
||||
)
|
||||
|
||||
_rustc_opts_debug=(
|
||||
'verbose[in general, enable more debug printouts]'
|
||||
'time-passes[measure time of each rustc pass]'
|
||||
'count-llvm-insns[count where LLVM instrs originate]'
|
||||
'time-llvm-passes[measure time of each LLVM pass]'
|
||||
'trans-stats[gather trans statistics]'
|
||||
'asm-comments[generate comments into the assembly (may change behavior)]'
|
||||
'no-verify[skip LLVM verification]'
|
||||
'borrowck-stats[gather borrowck statistics]'
|
||||
'no-landing-pads[omit landing pads for unwinding]'
|
||||
'debug-llvm[enable debug output from LLVM]'
|
||||
'show-span[show spans for compiler debugging]'
|
||||
'count-type-sizes[count the sizes of aggregate types]'
|
||||
'meta-stats[gather metadata statistics]'
|
||||
'no-opt[do not optimize, even if -O is passed]'
|
||||
'print-link-args[Print the arguments passed to the linker]'
|
||||
'gc[Garbage collect shared data (experimental)]'
|
||||
'print-llvm-passes[Prints the llvm optimization passes being run]'
|
||||
'lto[Perform LLVM link-time optimizations]'
|
||||
'ast-json[Print the AST as JSON and halt]'
|
||||
'ast-json-noexpand[Print the pre-expansion AST as JSON and halt]'
|
||||
'ls[List the symbols defined by a library crate]'
|
||||
'save-analysis[Write syntax and type analysis information in addition to normal output]'
|
||||
'flowgraph-print-loans[Include loan analysis data in --pretty flowgraph output]'
|
||||
'flowgraph-print-moves[Include move analysis data in --pretty flowgraph output]'
|
||||
'flowgraph-print-assigns[Include assignment analysis data in --pretty flowgraph output]'
|
||||
'flowgraph-print-all[Include all dataflow analysis data in --pretty flowgraph output]'
|
||||
)
|
||||
|
||||
_rustc_opts_fun_lint(){
|
||||
_values -s , 'options' \
|
||||
"$_rustc_opts_lint[@]"
|
||||
}
|
||||
|
||||
_rustc_opts_fun_debug(){
|
||||
_values 'options' "$_rustc_opts_debug[@]"
|
||||
}
|
||||
|
||||
_rustc_opts_fun_codegen(){
|
||||
_values 'options' "$_rustc_opts_codegen[@]"
|
||||
}
|
||||
|
||||
_arguments -s : \
|
||||
'(-W --warn)'{-W,--warn=}'[Set lint warnings]:lint options:_rustc_opts_fun_lint' \
|
||||
'(-A --allow)'{-A,--allow=}'[Set lint allowed]:lint options:_rustc_opts_fun_lint' \
|
||||
'(-D --deny)'{-D,--deny=}'[Set lint denied]:lint options:_rustc_opts_fun_lint' \
|
||||
'(-F --forbid)'{-F,--forbid=}'[Set lint forbidden]:lint options:_rustc_opts_fun_lint' \
|
||||
'*-Z[Set internal debugging options]:debug options:_rustc_opts_fun_debug' \
|
||||
'*-C[Set internal Codegen options]:codegen options:_rustc_opts_fun_codegen' \
|
||||
"$_rustc_opts_switches[@]" \
|
||||
"$_rustc_opts_vals[@]" \
|
||||
'::files:_files -g "*.rs"'
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
user_commands=(
|
||||
list-units is-active status show help list-unit-files
|
||||
is-enabled list-jobs show-environment cat)
|
||||
is-enabled list-jobs show-environment cat list-timers)
|
||||
|
||||
sudo_commands=(
|
||||
start stop reload restart try-restart isolate kill
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#compdef task
|
||||
#
|
||||
# Copyright 2010 - 2015 Johannes Schlatow
|
||||
# Copyright 2010 - 2016 Johannes Schlatow
|
||||
# Copyright 2009 P.C. Shyamshankar
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
|
||||
_task_projects=($(task _projects))
|
||||
_task_tags=($(task _tags))
|
||||
_task_ids=($(task _ids))
|
||||
_task_zshids=( ${(f)"$(task _zshids)"} )
|
||||
_task_config=($(task _config))
|
||||
_task_columns=($(task _columns))
|
||||
|
|
@ -139,8 +138,10 @@ task_dates=(
|
|||
)
|
||||
|
||||
local -a task_zshids
|
||||
_regex_words values 'task IDs' $_task_zshids
|
||||
task_zshids=("$reply[@]")
|
||||
if (( $#_task_zshids )); then
|
||||
_regex_words values 'task IDs' $_task_zshids
|
||||
task_zshids=("$reply[@]")
|
||||
fi
|
||||
|
||||
_regex_words values 'task frequencies' \
|
||||
'daily:Every day' \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ local active_text=reverse
|
|||
# This doesn't cover scripts named "[0-9]## *", which should be very rare
|
||||
# (#s) is ^, (#e) is $, # is *, ## is + (comparing to regex)
|
||||
# | is alternative, but only in ()
|
||||
local NLIST_COLORING_PATTERN="((#s) #[0-9]## |[[][^]]#](#e)|[^ 0-9/?\\\\][^/\\\\]#(#e)|[^ /\\\\]##[^0-9/\\\\ ]##[^/\\\\]#(#e))"
|
||||
local NLIST_COLORING_PATTERN="((#s) #[0-9]## |[[][^]]#](#e)|[^ 0-9/?\\\\][^/\\\\]#(#e))"
|
||||
local NLIST_COLORING_COLOR=$'\x1b[00;33m'
|
||||
local NLIST_COLORING_MATCH_MULTIPLE=1
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ local bold=0
|
|||
local colorpair="white/black"
|
||||
|
||||
# Should draw the border?
|
||||
local border=1
|
||||
local border=0
|
||||
|
||||
# Combinations of colors to try out with Ctrl-T and Ctrl-G
|
||||
# The last number is the bold option, 0 or 1
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
autoload colors
|
||||
colors
|
||||
|
||||
local h1="$fg_bold[cyan]"
|
||||
local h1="$fg_bold[magenta]"
|
||||
local h2="$fg_bold[green]"
|
||||
local h3="$fg_bold[blue]"
|
||||
local h4="$fg_bold[yellow]"
|
||||
local h5="$fg_bold[magenta]"
|
||||
local h5="$fg_bold[cyan]"
|
||||
local rst="$reset_color"
|
||||
|
||||
LESS="-iRc" less <<<"
|
||||
|
|
@ -93,4 +93,43 @@ start. This is a way to have handy set of bookmarks prepared in private
|
|||
history's file.
|
||||
|
||||
Private history is instantly shared among sessions.
|
||||
|
||||
${h1}Zshrc integration${rst}
|
||||
|
||||
There are 5 standard configuration variables that can be set in zshrc:
|
||||
|
||||
${h4}znt_history_active_text${rst}
|
||||
\"underline\" or \"reverse\" - how should be active element highlighted
|
||||
${h4}znt_history_nlist_coloring_pattern${rst}
|
||||
Pattern that can be used to colorize elements
|
||||
${h4}znt_history_nlist_coloring_color${rst}
|
||||
Color with which to colorize via the pattern
|
||||
${h4}znt_history_nlist_coloring_match_multiple${rst}
|
||||
Should multiple matches be colorized (${h2}\"0\"${rst} or ${h2}\"1\"${rst})
|
||||
${h4}znt_history_keywords ${h2}(array)${rst}
|
||||
Search keywords activated with Ctrl-X, F2, Ctrl-/, e.g. ( ${h2}\"git\"${rst} ${h2}\"vim\"${rst} )
|
||||
|
||||
Above variables will work for n-history tool. For other tools, change
|
||||
\"_history_\" to e.g. \"_cd_\", for the n-cd tool. The same works for
|
||||
all 8 tools.
|
||||
|
||||
Common configuration of the tools uses variables with \"_list_\" in them:
|
||||
|
||||
${h4}znt_list_bold${rst}
|
||||
Should draw text in bold (${h2}\"0\"${rst} or ${h2}\"1\"${rst})
|
||||
${h4}znt_list_colorpair${rst}
|
||||
Main pair of colors to be used, e.g ${h2}\"green/black\"${rst}
|
||||
${h4}znt_list_border${rst}
|
||||
Should draw borders around windows (${h2}\"0\"${rst} or ${h2}\"1\"${rst})
|
||||
${h4}znt_list_themes ${h2}(array)${rst}
|
||||
List of themes to try out with Ctrl-T, e.g. ( ${h2}\"white/black/1\"${rst}
|
||||
${h2}\"green/black/0\"${rst} )
|
||||
${h4}znt_list_instant_select${rst}
|
||||
Should pressing enter in search mode leave tool (${h2}\"0\"${rst} or ${h2}\"1\"${rst})
|
||||
|
||||
If you used ZNT before v2.1.12 then remove old configuration files
|
||||
${h3}~/.config/znt/*.conf${rst} so that ZNT can update them to the latest versions
|
||||
that support integration with Zshrc. If you used installer then run it
|
||||
again (after the remove of configuration files), that is not needed when
|
||||
using as plugin.
|
||||
"
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ _nhistory_generate_most_frequent() {
|
|||
vk+="$v"$'\t'"$k"
|
||||
done
|
||||
|
||||
print -rl "$title" "${(On)vk[@]}" > "$most_frequent_db"
|
||||
print -rl -- "$title" "${(On)vk[@]}" > "$most_frequent_db"
|
||||
}
|
||||
|
||||
# Load configuration
|
||||
|
|
@ -337,16 +337,16 @@ if [ "$REPLY" -gt 0 ]; then
|
|||
selected="$reply[REPLY]"
|
||||
# ZLE?
|
||||
if [ "${(t)CURSOR}" = "integer-local-special" ]; then
|
||||
zle redisplay
|
||||
zle kill-buffer
|
||||
zle .redisplay
|
||||
zle .kill-buffer
|
||||
LBUFFER+="$selected"
|
||||
|
||||
# Append to private history
|
||||
local newline=$'\n'
|
||||
selected="${selected//$newline/\\$newline}"
|
||||
[ "$active_view" = "0" ] && print -r "$selected" >> "$private_history_db"
|
||||
[ "$active_view" = "0" ] && print -r -- "$selected" >> "$private_history_db"
|
||||
else
|
||||
print -zr "$selected"
|
||||
print -zr -- "$selected"
|
||||
fi
|
||||
else
|
||||
[ "${(t)CURSOR}" = "integer-local-special" ] && zle redisplay
|
||||
|
|
|
|||
|
|
@ -445,7 +445,10 @@ while (( 1 )); do
|
|||
|
||||
[ "$border" = "1" ] && zcurses border main
|
||||
|
||||
local top_msg=" F1-change view, ${(C)ZSH_NAME} $ZSH_VERSION, shell level $SHLVL "
|
||||
local top_msg=" ${(C)ZSH_NAME} $ZSH_VERSION, shell level $SHLVL "
|
||||
if [[ "${NLIST_ENABLED_EVENTS[(r)F1]}" = "F1" ]]; then
|
||||
top_msg=" F1-change view,$top_msg"
|
||||
fi
|
||||
zcurses move main 0 $(( term_width / 2 - $#top_msg / 2 ))
|
||||
zcurses string main $top_msg
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ plugins=(git)
|
|||
zstyle ':completion:*:descriptions' format '%B%d%b'
|
||||
# User configuration
|
||||
|
||||
export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
|
|
|||
|
|
@ -41,4 +41,10 @@ PROMPT='
|
|||
%~
|
||||
${smiley} %{$reset_color%}'
|
||||
|
||||
RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'
|
||||
if [[ -d ~/.rvm ]] && [[ -e ~/.rvm/bin/rvm-prompt ]]; then
|
||||
rvm_prompt='$(~/.rvm/bin/rvm-prompt)'
|
||||
else
|
||||
rvm_prompt=''
|
||||
fi
|
||||
|
||||
RPROMPT='%{$fg[white]%} $rvm_prompt$(git_prompt)%{$reset_color%}'
|
||||
|
|
|
|||
|
|
@ -53,11 +53,6 @@ main() {
|
|||
echo "Error: git is not installed"
|
||||
exit 1
|
||||
}
|
||||
env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
|
||||
printf "Error: git clone of oh-my-zsh repo failed\n"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# The Windows (MSYS) Git is not compatible with normal use on cygwin
|
||||
if [ "$OSTYPE" = cygwin ]; then
|
||||
if git --version | grep msysgit > /dev/null; then
|
||||
|
|
@ -66,6 +61,11 @@ main() {
|
|||
exit 1
|
||||
fi
|
||||
fi
|
||||
env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
|
||||
printf "Error: git clone of oh-my-zsh repo failed\n"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
|
||||
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
|
||||
|
|
@ -80,12 +80,6 @@ main() {
|
|||
" ~/.zshrc > ~/.zshrc-omztemp
|
||||
mv -f ~/.zshrc-omztemp ~/.zshrc
|
||||
|
||||
printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
|
||||
sed "/export PATH=/ c\\
|
||||
export PATH=\"$PATH\"
|
||||
" ~/.zshrc > ~/.zshrc-omztemp
|
||||
mv -f ~/.zshrc-omztemp ~/.zshrc
|
||||
|
||||
# If this user's login shell is not already "zsh", attempt to switch.
|
||||
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
|
||||
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue