Merge branch 'master' of http://github.com/kennethreitz/oh-my-zsh into kennethreitz-master
This commit is contained in:
commit
7e66da3534
@ -1,4 +1,4 @@
|
|||||||
## fixme - the load process here seems a bit bizarre
|
# fixme - the load process here seems a bit bizarre
|
||||||
|
|
||||||
unsetopt menu_complete # do not autoselect the first completion entry
|
unsetopt menu_complete # do not autoselect the first completion entry
|
||||||
unsetopt flowcontrol
|
unsetopt flowcontrol
|
||||||
@ -30,6 +30,11 @@ zstyle ':completion:*:*:*:*:*' menu select
|
|||||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
||||||
zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
|
zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
|
||||||
|
|
||||||
|
# disable named-directories autocompletion
|
||||||
|
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
||||||
|
cdpath=(.)
|
||||||
|
|
||||||
|
|
||||||
# Load known hosts file for auto-completion with ssh and scp commands
|
# Load known hosts file for auto-completion with ssh and scp commands
|
||||||
if [ -f ~/.ssh/known_hosts ]; then
|
if [ -f ~/.ssh/known_hosts ]; then
|
||||||
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
|
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
|
||||||
|
@ -5,7 +5,7 @@ function title {
|
|||||||
print -nR $'\033k'$1$'\033'\\\
|
print -nR $'\033k'$1$'\033'\\\
|
||||||
|
|
||||||
print -nR $'\033]0;'$2$'\a'
|
print -nR $'\033]0;'$2$'\a'
|
||||||
elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
|
elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then
|
||||||
# Use this one instead for XTerms:
|
# Use this one instead for XTerms:
|
||||||
print -nR $'\033]0;'$*$'\a'
|
print -nR $'\033]0;'$*$'\a'
|
||||||
fi
|
fi
|
||||||
|
@ -20,6 +20,7 @@ bindkey "^[[F" end-of-line
|
|||||||
bindkey "^[[4~" end-of-line
|
bindkey "^[[4~" end-of-line
|
||||||
bindkey ' ' magic-space # also do history expansion on space
|
bindkey ' ' magic-space # also do history expansion on space
|
||||||
|
|
||||||
|
bindkey '^[[Z' reverse-menu-complete
|
||||||
|
|
||||||
# consider emacs keybindings:
|
# consider emacs keybindings:
|
||||||
|
|
||||||
|
@ -21,5 +21,3 @@ then
|
|||||||
else
|
else
|
||||||
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
|
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset config_file
|
|
39
plugins/dirpersist.plugin.zsh
Normal file
39
plugins/dirpersist.plugin.zsh
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
#
|
||||||
|
# Make the dirstack more persistant
|
||||||
|
#
|
||||||
|
# Add dirpersist to $plugins in ~/.zshrc to load
|
||||||
|
#
|
||||||
|
|
||||||
|
# $zdirstore is the file used to persist the stack
|
||||||
|
zdirstore=~/.zdirstore
|
||||||
|
|
||||||
|
dirpersistinstall () {
|
||||||
|
if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
|
||||||
|
else
|
||||||
|
if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
|
||||||
|
echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
|
||||||
|
else
|
||||||
|
echo "If you don't want this message to appear, remove dirspersist from \$plugins"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
dirpersiststore () {
|
||||||
|
dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
|
||||||
|
}
|
||||||
|
|
||||||
|
dirpersistrestore () {
|
||||||
|
if [ -f $zdirstore ]; then
|
||||||
|
source $zdirstore
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
DIRSTACKSIZE=10
|
||||||
|
setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
|
||||||
|
|
||||||
|
dirpersistinstall
|
||||||
|
dirpersistrestore
|
||||||
|
|
||||||
|
# Make popd changes permanent without having to wait for logout
|
||||||
|
alias popd="popd;dirpersiststore"
|
7
plugins/macports.plugin.zsh
Normal file
7
plugins/macports.plugin.zsh
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#Aliases
|
||||||
|
alias pc="sudo port clean --all installed"
|
||||||
|
alias pi="sudo port install $1"
|
||||||
|
alias psu="sudo port selfupdate"
|
||||||
|
alias puni="sudo port uninstall inactive"
|
||||||
|
alias puo="sudo port upgrade outdated"
|
||||||
|
alias pup="psu && puo"
|
23
plugins/ssh-agent.plugin.zsh
Normal file
23
plugins/ssh-agent.plugin.zsh
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# Based on code from Joseph M. Reagle
|
||||||
|
# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
|
||||||
|
|
||||||
|
local SSH_ENV=$HOME/.ssh/environment
|
||||||
|
|
||||||
|
function start_agent {
|
||||||
|
/usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
|
||||||
|
chmod 600 ${SSH_ENV}
|
||||||
|
. ${SSH_ENV} > /dev/null
|
||||||
|
/usr/bin/ssh-add;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Source SSH settings, if applicable
|
||||||
|
|
||||||
|
if [ -f "${SSH_ENV}" ]; then
|
||||||
|
. ${SSH_ENV} > /dev/null
|
||||||
|
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
|
||||||
|
start_agent;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
start_agent;
|
||||||
|
fi
|
||||||
|
|
22
plugins/vi-mode.plugin.zsh
Normal file
22
plugins/vi-mode.plugin.zsh
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
function zle-line-init zle-keymap-select {
|
||||||
|
zle reset-prompt
|
||||||
|
}
|
||||||
|
|
||||||
|
zle -N zle-line-init
|
||||||
|
zle -N zle-keymap-select
|
||||||
|
|
||||||
|
bindkey -v
|
||||||
|
|
||||||
|
# if mode indicator wasn't setup by theme, define default
|
||||||
|
if [[ "$MODE_INDICATOR" == "" ]]; then
|
||||||
|
MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
function vi_mode_prompt_info() {
|
||||||
|
echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# define right prompt, if it wasn't defined by a theme
|
||||||
|
if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
|
||||||
|
RPS1='$(vi_mode_prompt_info)'
|
||||||
|
fi
|
6
themes/theunraveler.zsh-theme
Normal file
6
themes/theunraveler.zsh-theme
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# Comment
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=')'
|
||||||
|
|
||||||
|
PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
|
Reference in New Issue
Block a user