mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-01-09 02:24:03 +01:00
Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh
Conflicts: README.textile custom/plugins/launch_trial/_launch_trial.sh plugins/encode64/encode64.plugin.zsh plugins/git/git.plugin.zsh templates/zshrc-linux.zsh templates/zshrc-mac.zsh templates/zshrc.zsh-template tools/install.sh Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet
commit
b964433381
8 changed files with 100 additions and 10 deletions
|
|
@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`.
|
|||
|
||||
h4. via `curl`
|
||||
|
||||
@curl -L https://github.com/cadusk/oh-my-zsh/raw/master/tools/install.sh | sh@
|
||||
@curl -L https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh | sh@
|
||||
|
||||
h4. via `wget`
|
||||
|
||||
@wget --no-check-certificate https://github.com/cadusk/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
|
||||
@wget --no-check-certificate https://github.com/stibbons/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
|
||||
|
||||
h3. The manual way
|
||||
|
||||
|
||||
1. Clone the repository
|
||||
|
||||
@git clone git://github.com/cadusk/oh-my-zsh.git ~/.oh-my-zsh@
|
||||
@git clone git://github.com/stibbons/oh-my-zsh.git ~/.oh-my-zsh@
|
||||
|
||||
2. *OPTIONAL* Backup your existing ~/.zshrc file
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ h2. Usage
|
|||
* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
|
||||
** example: @plugins=(git osx ruby)@
|
||||
* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
|
||||
** Take a look at the "current themes":https://wiki.github.com/cadusk/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
|
||||
** Take a look at the "current themes":https://wiki.github.com/stibbons/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
|
||||
* much much more... take a look at @lib/@ what _Oh My Zsh_ offers...
|
||||
|
||||
h2. Useful
|
||||
|
|
@ -84,6 +84,6 @@ h2. Contributors
|
|||
|
||||
This project wouldn't exist without all of our awesome users and contributors.
|
||||
|
||||
* "View our growing list of contributors":https://github.com/cadusk/oh-my-zsh/contributors
|
||||
* "View our growing list of contributors":https://github.com/stibbons/oh-my-zsh/contributors
|
||||
|
||||
Thank you so much!
|
||||
|
|
|
|||
5
completions/_blop
Normal file
5
completions/_blop
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
#compdef blop
|
||||
|
||||
|
||||
_arguments "1: :(World)"
|
||||
|
||||
8
plugins/buildbot/buildbot.plugin.zsh
Normal file
8
plugins/buildbot/buildbot.plugin.zsh
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#compdef buildbot
|
||||
|
||||
# Aliases
|
||||
alias b='buildbot'
|
||||
|
||||
zstyle ':completion:*:descriptions' format '%B%d%b'
|
||||
|
||||
|
||||
74
plugins/git/_git-remote
Normal file
74
plugins/git/_git-remote
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
#compdef git-remote
|
||||
|
||||
# NOTE: --track is undocumented.
|
||||
# TODO: --track, -t, --master, and -m should take remote branches, I guess.
|
||||
# NOTE: --master is undocumented.
|
||||
# NOTE: --fetch is undocumented.
|
||||
_git-remote () {
|
||||
local curcontext=$curcontext state line
|
||||
declare -A opt_args
|
||||
|
||||
_arguments -C \
|
||||
':command:->command' \
|
||||
'*::options:->options' && ret=0
|
||||
|
||||
case $state in
|
||||
(command)
|
||||
declare -a commands
|
||||
|
||||
commands=(
|
||||
'add:add a new remote'
|
||||
'show:show information about a given remote'
|
||||
'prune:delete all stale tracking branches for a given remote'
|
||||
'update:fetch updates for a set of remotes'
|
||||
'rm:remove a remote from .git/config and all associated tracking branches'
|
||||
'rename:rename a remote from .git/config and update all associated tracking branches'
|
||||
'set-head:sets or deletes the default branch'
|
||||
'set-branches:changes the list of branches tracked by the named remote.'
|
||||
'set-url:changes URL remote points to.'
|
||||
)
|
||||
|
||||
_describe -t commands 'sub-command' commands && ret=0
|
||||
;;
|
||||
(options)
|
||||
case $line[1] in
|
||||
(add)
|
||||
_arguments \
|
||||
'*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \
|
||||
'(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \
|
||||
'(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \
|
||||
':branch name:__git_remotes' \
|
||||
':url:_urls' && ret=0
|
||||
;;
|
||||
(show)
|
||||
_arguments \
|
||||
'-n[do not contact the remote for a list of branches]' \
|
||||
':remote:__git_remotes' && ret=0
|
||||
;;
|
||||
(prune)
|
||||
_arguments \
|
||||
'(--dry-run -n)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \
|
||||
':remote:__git_remotes' && ret=0
|
||||
;;
|
||||
(update)
|
||||
__git_remote-groups && ret=0
|
||||
;;
|
||||
(rm)
|
||||
__git_remotes && ret=0
|
||||
;;
|
||||
(rename)
|
||||
__git_remotes && ret=0
|
||||
;;
|
||||
(set-url)
|
||||
_arguments \
|
||||
'*--push[manipulate push URLs]' \
|
||||
'(--add)--add[add URL]' \
|
||||
'(--delete)--delete[delete URLs]' \
|
||||
':branch name:__git_remotes' \
|
||||
':url:_urls' && ret=0
|
||||
;;
|
||||
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -10,3 +10,4 @@ function pyclean() {
|
|||
|
||||
# Grep among .py files
|
||||
alias pygrep='grep --include="*.py"'
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
|
|||
# Look in ~/.oh-my-zsh/themes/
|
||||
# Optionally, if you set this to "random", it'll load a random theme each
|
||||
# time that oh-my-zsh is loaded.
|
||||
ZSH_THEME="mh"
|
||||
ZSH_THEME="stibbons"
|
||||
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
|
|
@ -15,7 +15,7 @@ ZSH_THEME="mh"
|
|||
# CASE_SENSITIVE="true"
|
||||
|
||||
# Comment this out to disable weekly auto-update checks
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
DISABLE_AUTO_UPDATE="false"
|
||||
|
||||
# Uncomment following line if you want to disable colors in ls
|
||||
# DISABLE_LS_COLORS="true"
|
||||
|
|
@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
|
|||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases vim-scp)
|
||||
plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
# source `which virtualenvwrapper.sh`
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
|
|||
# Look in ~/.oh-my-zsh/themes/
|
||||
# Optionally, if you set this to "random", it'll load a random theme each
|
||||
# time that oh-my-zsh is loaded.
|
||||
ZSH_THEME="mh"
|
||||
ZSH_THEME="stibbons"
|
||||
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
|
|||
# Look in ~/.oh-my-zsh/themes/
|
||||
# Optionally, if you set this to "random", it'll load a random theme each
|
||||
# time that oh-my-zsh is loaded.
|
||||
ZSH_THEME="gsemet"
|
||||
ZSH_THEME="stibbons"
|
||||
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
|
|
@ -37,6 +37,8 @@ plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-
|
|||
source $ZSH/oh-my-zsh.sh
|
||||
source `which virtualenvwrapper.sh`
|
||||
|
||||
zstyle ':completion:*:descriptions' format '%B%d%b'
|
||||
|
||||
# Customize to your needs...
|
||||
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
|
||||
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue