diff --git a/Makefile b/Makefile index 4c7e89e..fa3ec0c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,18 @@ +update: + hg pull -q --repository autojump + @hg update --repository autojump + hg pull -q --repository zsh-syntax-highlighting + @hg update --repository zsh-syntax-highlighting + hg pull -q --repository oh-my-zsh + @hg update --repository oh-my-zsh + hg pull -q --repository fizsh + @hg update --repository fizsh + install: mv ../.zshrc zshrc.bak ln -s zshrc ../.zshrc touch history private + hg clone git://github.com/joelthelion/autojump.git hg clone git://github.com/nicoulaj/zsh-syntax-highlighting.git + hg clone git://github.com/robbyrussell/oh-my-zsh.git + hg clone git://fizsh.git.sourceforge.net/gitroot/fizsh/fizsh diff --git a/aliases.zsh b/aliases.zsh index dd6269c..2c93f02 100644 --- a/aliases.zsh +++ b/aliases.zsh @@ -12,9 +12,6 @@ alias vedit=" $EDITOR ~/.vimrc" #alias man="unset PAGER; man" alias grep='grep --color=auto' -# g for go! is more natural than the autojumps j command -alias g=j - ##### standard aliases (start with a space to be ignored in history) alias ls='ls --color=auto' alias ll=' ls -lhF' @@ -22,7 +19,7 @@ alias la=' ls -A' alias l=' ls -CF' alias v=" clear; ls -Flgh" -alias psgrep='ps aux|grep ' +alias g='ps aux|grep ' alias d=' dirs -v' alias ..=' cd ..; ls' diff --git a/prompt.zsh b/prompt.zsh index 455c121..5e10faf 100644 --- a/prompt.zsh +++ b/prompt.zsh @@ -92,6 +92,7 @@ add-zsh-hook preexec promptSetMultiplexerTabTitle # setup tmux environment (context + status) # TODO: shorten the path variable +# TODO: remove sudo if available... function tmuxChangeDirectory () { # set the tmux status line if [[ "$TMUX" != "" ]]; then