Ashley Valent
12 years ago
commit
3b6a695b60
34 changed files with 273 additions and 248 deletions
@ -1,35 +0,0 @@ |
|||||||
# Push and pop directories on directory stack |
|
||||||
alias pu='pushd' |
|
||||||
alias po='popd' |
|
||||||
|
|
||||||
# Basic directory operations |
|
||||||
alias ...='cd ../..' |
|
||||||
alias -- -='cd -' |
|
||||||
|
|
||||||
# Super user |
|
||||||
alias _='sudo' |
|
||||||
alias please='sudo' |
|
||||||
|
|
||||||
#alias g='grep -in' |
|
||||||
|
|
||||||
# Show history |
|
||||||
if [ "$HIST_STAMPS" = "mm/dd/yyyy" ] |
|
||||||
then |
|
||||||
alias history='fc -fl 1' |
|
||||||
elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ] |
|
||||||
then |
|
||||||
alias history='fc -El 1' |
|
||||||
elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ] |
|
||||||
then |
|
||||||
alias history='fc -il 1' |
|
||||||
else |
|
||||||
alias history='fc -l 1' |
|
||||||
fi |
|
||||||
# List direcory contents |
|
||||||
alias lsa='ls -lah' |
|
||||||
alias l='ls -lah' |
|
||||||
alias ll='ls -lh' |
|
||||||
alias la='ls -lAh' |
|
||||||
|
|
||||||
alias afind='ack-grep -il' |
|
||||||
|
|
||||||
@ -1,10 +1,37 @@ |
|||||||
## |
# enables cycling through the directory stack using |
||||||
# dircycle plugin: enables cycling through the directory |
# Ctrl+Shift+Left/Right |
||||||
# stack using Ctrl+Shift+Left/Right |
# |
||||||
|
# left/right direction follows the order in which directories |
||||||
|
# were visited, like left/right arrows do in a browser |
||||||
|
|
||||||
eval "insert-cycledleft () { zle push-line; LBUFFER='pushd -q +1'; zle accept-line }" |
# NO_PUSHD_MINUS syntax: |
||||||
|
# pushd +N: start counting from left of `dirs' output |
||||||
|
# pushd -N: start counting from right of `dirs' output |
||||||
|
|
||||||
|
insert-cycledleft () { |
||||||
|
emulate -L zsh |
||||||
|
setopt nopushdminus |
||||||
|
|
||||||
|
builtin pushd -q +1 &>/dev/null || true |
||||||
|
zle reset-prompt |
||||||
|
} |
||||||
zle -N insert-cycledleft |
zle -N insert-cycledleft |
||||||
bindkey "\e[1;6D" insert-cycledleft |
|
||||||
eval "insert-cycledright () { zle push-line; LBUFFER='pushd -q +0'; zle accept-line }" |
insert-cycledright () { |
||||||
|
emulate -L zsh |
||||||
|
setopt nopushdminus |
||||||
|
|
||||||
|
builtin pushd -q -0 &>/dev/null || true |
||||||
|
zle reset-prompt |
||||||
|
} |
||||||
zle -N insert-cycledright |
zle -N insert-cycledright |
||||||
bindkey "\e[1;6C" insert-cycledright |
|
||||||
|
|
||||||
|
# add key bindings for iTerm2 |
||||||
|
if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then |
||||||
|
bindkey "^[[1;6D" insert-cycledleft |
||||||
|
bindkey "^[[1;6C" insert-cycledright |
||||||
|
else |
||||||
|
bindkey "\e[1;6D" insert-cycledleft |
||||||
|
bindkey "\e[1;6C" insert-cycledright |
||||||
|
fi |
||||||
@ -1,65 +1,70 @@ |
|||||||
virtualenvwrapper='virtualenvwrapper.sh' |
virtualenvwrapper='virtualenvwrapper.sh' |
||||||
if (( $+commands[$virtualenvwrapper] )); then |
|
||||||
|
|
||||||
|
if (( $+commands[$virtualenvwrapper] )); then |
||||||
source ${${virtualenvwrapper}:c} |
source ${${virtualenvwrapper}:c} |
||||||
|
elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then |
||||||
|
virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper" |
||||||
|
source "/etc/bash_completion.d/virtualenvwrapper" |
||||||
|
else |
||||||
|
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\ |
||||||
|
"Please install with \`pip install virtualenvwrapper\`" >&2 |
||||||
|
return |
||||||
|
fi |
||||||
|
if ! type workon &>/dev/null; then |
||||||
|
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\ |
||||||
|
"Please check ${virtualenvwrapper}" >&2 |
||||||
|
return |
||||||
|
fi |
||||||
|
|
||||||
if [[ "$WORKON_HOME" == "" ]]; then |
if [[ "$WORKON_HOME" == "" ]]; then |
||||||
echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" |
print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2 |
||||||
else |
return |
||||||
|
fi |
||||||
|
|
||||||
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then |
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then |
||||||
# Automatically activate Git projects's virtual environments based on the |
# Automatically activate Git projects's virtual environments based on the |
||||||
# directory name of the project. Virtual environment name can be overridden |
# directory name of the project. Virtual environment name can be overridden |
||||||
# by placing a .venv file in the project root with a virtualenv name in it |
# by placing a .venv file in the project root with a virtualenv name in it |
||||||
function workon_cwd { |
function workon_cwd { |
||||||
if [ ! $WORKON_CWD ]; then |
if [ ! $WORKON_CWD ]; then |
||||||
WORKON_CWD=1 |
WORKON_CWD=1 |
||||||
# Check if this is a Git repo |
# Check if this is a Git repo |
||||||
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` |
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` |
||||||
if (( $? != 0 )); then |
if (( $? != 0 )); then |
||||||
PROJECT_ROOT="." |
PROJECT_ROOT="." |
||||||
fi |
fi |
||||||
# Check for virtualenv name override |
# Check for virtualenv name override |
||||||
if [[ -f "$PROJECT_ROOT/.venv" ]]; then |
if [[ -f "$PROJECT_ROOT/.venv" ]]; then |
||||||
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` |
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` |
||||||
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then |
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then |
||||||
ENV_NAME="$PROJECT_ROOT/.venv" |
ENV_NAME="$PROJECT_ROOT/.venv" |
||||||
elif [[ "$PROJECT_ROOT" != "." ]]; then |
elif [[ "$PROJECT_ROOT" != "." ]]; then |
||||||
ENV_NAME=`basename "$PROJECT_ROOT"` |
ENV_NAME=`basename "$PROJECT_ROOT"` |
||||||
else |
else |
||||||
ENV_NAME="" |
ENV_NAME="" |
||||||
fi |
fi |
||||||
if [[ "$ENV_NAME" != "" ]]; then |
if [[ "$ENV_NAME" != "" ]]; then |
||||||
# Activate the environment only if it is not already active |
# Activate the environment only if it is not already active |
||||||
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then |
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then |
||||||
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then |
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then |
||||||
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" |
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" |
||||||
elif [[ -e "$ENV_NAME/bin/activate" ]]; then |
elif [[ -e "$ENV_NAME/bin/activate" ]]; then |
||||||
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" |
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" |
||||||
fi |
|
||||||
fi |
|
||||||
elif [ $CD_VIRTUAL_ENV ]; then |
|
||||||
# We've just left the repo, deactivate the environment |
|
||||||
# Note: this only happens if the virtualenv was activated automatically |
|
||||||
deactivate && unset CD_VIRTUAL_ENV |
|
||||||
fi |
fi |
||||||
unset PROJECT_ROOT |
|
||||||
unset WORKON_CWD |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Append workon_cwd to the chpwd_functions array, so it will be called on cd |
|
||||||
# http://zsh.sourceforge.net/Doc/Release/Functions.html |
|
||||||
# TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4 |
|
||||||
if (( ${+chpwd_functions} )); then |
|
||||||
if (( $chpwd_functions[(I)workon_cwd] == 0 )); then |
|
||||||
set -A chpwd_functions $chpwd_functions workon_cwd |
|
||||||
fi |
fi |
||||||
else |
elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then |
||||||
set -A chpwd_functions workon_cwd |
# We've just left the repo, deactivate the environment |
||||||
|
# Note: this only happens if the virtualenv was activated automatically |
||||||
|
deactivate && unset CD_VIRTUAL_ENV |
||||||
fi |
fi |
||||||
|
unset PROJECT_ROOT |
||||||
|
unset WORKON_CWD |
||||||
fi |
fi |
||||||
|
} |
||||||
|
|
||||||
|
# Append workon_cwd to the chpwd_functions array, so it will be called on cd |
||||||
|
# http://zsh.sourceforge.net/Doc/Release/Functions.html |
||||||
|
if ! (( $chpwd_functions[(I)workon_cwd] )); then |
||||||
|
chpwd_functions+=(workon_cwd) |
||||||
fi |
fi |
||||||
else |
|
||||||
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`." |
|
||||||
fi |
fi |
||||||
|
|||||||
Loading…
Reference in new issue