@@ -1,7 +1,7 @@ #! /bin/zsh -f alias_exists tail inotail -alias_exists bandwidth 's bind localhost' bing +alias_exists bandwidth 's bing localhost' bing alias_exists top htop alias activeoptions='egrep -v "#|^ *$"' @@ -60,4 +60,6 @@ alias gl='git pull' alias gp='git push' alias gst='git status' -alias ls="ls $LS_OPTIONS" \ No newline at end of file +alias hc="hg commit -m" + +alias ls="ls $LS_OPTIONS" .zsh/aliases @@ -1,9 +1,11 @@ #! /bin/zsh -f function zsh_prompt {} +function hg_prompt {} function precmd { vcs_info + hg_prompt zsh_prompt } @@ -13,13 +15,13 @@ function chpwd { sun-cmd) print -Pn "\e]l%~\e\\" ;; *xterm*|rxvt|(dt|k|E|e)term|eterm-color) print -Pn "\e]2;%~ | %M\a" -;; -esac + ;; + esac } function qwhich { - result=`which $@` + result=`which $@ 2> /dev/null` [[ $? == 0 ]] && echo $result } @@ -33,7 +35,7 @@ function alias_exists { fi } -function service { sudo $RCDIR$1 $2; } +#function service { sudo $RCDIR$1 $2; } function psg { ps aux | grep "[${1[1]}]${1[2,-1]}"; } function status { @@ -45,3 +47,18 @@ function status { hg status fi } + +function chromeapp { + google-chrome --enable-user-scripts --enable-extensions --bookmark-menu --app="$*" & +} + +function gmail {chromeapp "http://mail.google.com/a/kudria.net" } +function greader {chromeapp "http://google.com/reader" } +function gcal {chromeapp "http://calendar.google.com/a/kudria.net" } +function gwave {chromeapp "http://wave.google.com/wave" } +function ganalytics {chromeapp "http://analytics.google.com" } +function rmilk {chromeapp "http://rememberthemilk.com" } +function tumblrdash {chromeapp "http://tumblr.com/dashboard" } +function twitter {chromeapp "http://twitter.com" } +function simplenote {chromeapp "http://simple-note.appspot.com" } +#function {chromeapp "http://" } \ No newline at end of file .zsh/functions @@ -1,7 +1,5 @@ #! /bin/zsh -f -colors - HASHSTRING=`hostname` if [[ $DISTRO = "CentOS" ]]; then @@ -9,7 +7,7 @@ if [[ $DISTRO = "CentOS" ]]; then fi HOSTCOLORCODE=255 -`qwhich hosts.rb` && HOSTCOLORCODE=$(hosts.rb -d $HASHSTRING) +`qwhich hosts.rb > /dev/null` && HOSTCOLORCODE=$(hosts.rb -l $HASHSTRING) [ $TERM = 'eterm-color' ] && HOSTCOLORCODE=34 @@ -17,17 +15,25 @@ ESCAPE=$'%{\e[%}' HOSTCOLORESCAPE=$'%{'$ESCAPE'38;5;'$HOSTCOLORCODE$'m%}' +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:*' get-revision true + zstyle ':vcs_info:*' unstagedstr '*' zstyle ':vcs_info:*' stagedstr '-' -zstyle ':vcs_info:*' actionformats '%c%u%b|%a' -zstyle ':vcs_info:*' formats '%c%u%b' -zstyle ':vcs_info:*' branchformat '%b:%r' +zstyle ':vcs_info:*' actionformats '%b%c%u|%a' +zstyle ':vcs_info:*' formats '%b%c%u' +zstyle ':vcs_info:*' branchformat '%b' -zstyle ':vcs_info:*' enable git svn bzr hg +zstyle ':vcs_info:*' enable svn bzr hg git colors precmd +function hg_prompt() { + local HG_PROMPT_FORMAT='{:{node|short}}{ {status|modified|unknown}}{update}{ >{incoming|count}}{ {outgoing|count}>}' + export HG_PROMPT="`hg prompt $HG_PROMPT_FORMAT 2> /dev/null`" +} + function zsh_prompt() { local N=$'%{'$ESCAPE'0m%}' # unsets color to term's fg color @@ -39,9 +45,9 @@ function zsh_prompt() local D="${UC}-${N}" - [ $UID -eq "0" ] && O="${UC}[${N}" - [ $UID -eq "0" ] && C="${UC}]${N}" - [ $UID -eq "0" ] && D="${UC}-${N}" + [[ $UID -eq "0" ]] && O="${UC}[${N}" + [[ $UID -eq "0" ]] && C="${UC}]${N}" + [[ $UID -eq "0" ]] && D="${UC}-${N}" local HO=$HOSTCOLORESCAPE @@ -51,7 +57,7 @@ function zsh_prompt() export PROMPT=" ${UC}${PRETTY_WD}${N}: " - export RPROMPT="${UC}%n${N}@${UC}%m${N} %(0?,,${UC}%?!${N} )${UC}${vcs_info_msg_0_}${N}" + export RPROMPT="${UC}%n${N}@${UC}%m${N} %(0?,,${UC}%?!${N} )${UC}${vcs_info_msg_0_}${HG_PROMPT}${N}" export PS2="${D}${O}" } .zsh/prompt @@ -19,4 +19,5 @@ bindkey '^i' expand-or-complete-prefix bindkey "^[[Z" reverse-menu-complete bindkey "^[" send-break -bindkey "^[e" backward-kill-word # \ No newline at end of file +bindkey "^[e" backward-kill-word +bindkey "^[w" backward-kill-word .zsh/zle 50efc68b7ea8ea7657c606d7f5b95c43485778ee Benjamin Kudria ben@kudria.net http://github.com/bkudria/dotfiles/commit/99532adf5188122f5ea83aa216546689a978dccd 99532adf5188122f5ea83aa216546689a978dccd 2009-10-28T14:22:02-07:00 2009-10-28T14:22:02-07:00 zsh changes - prompt, qwhich, aliases, etc 819f4f2249893260d24dfceeec248301e612502b Benjamin Kudria ben@kudria.net