|
|
@@ -48,8 +48,8 @@ export DIRSTACKSIZE=11 # stack size of eleven gives me a list with ten entries
|
|
|
_myhosts=( ${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*} )
|
|
|
zstyle ':completion:*' hosts $_myhosts
|
|
|
|
|
|
-HISTSIZE=3000
|
|
|
-SAVEHIST=3000
|
|
|
+HISTSIZE=10000
|
|
|
+SAVEHIST=10000
|
|
|
HISTFILE=~/.zsh_history
|
|
|
|
|
|
#####################
|
|
|
@@ -62,7 +62,6 @@ WORDCHARS='*?_-.[]~\!#$%^(){}<>|`@#$%^*()+:?'
|
|
|
|
|
|
## set up my prompt
|
|
|
export PS1="%{${fg[yellow]}%}[%n@%m] %{${fg[green]}%}%3~ %# %{${fg[default]}%}"
|
|
|
-#export RPS1="%{${fg[yellow]}%}%T%{${fg[default]}%}"
|
|
|
|
|
|
## color STDERR red
|
|
|
#exec 2>>(while read line; do
|
|
|
@@ -74,8 +73,10 @@ export PS1="%{${fg[yellow]}%}[%n@%m] %{${fg[green]}%}%3~ %# %{${fg[default]}%}"
|
|
|
#fi
|
|
|
|
|
|
## set list colours
|
|
|
+# TODO do we need to rework this?
|
|
|
export LS_COLORS='no=00:fi=00:di=00;36:ln=01;36:pi=40;33:so=00;35:bd=40;33;01:cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:ex=00;32:*.cmd=00;32:*.exe=00;32:*.com=00;32:*.btm=00;32:*.bat=00;32:*.sh=00;32:*.csh=00;32:*.tar=00;31:*.tgz=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.zip=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.bz=00;31:*.tz=00;31:*.rpm=00;31:*.cpio=00;31:*.jpg=00;35:*.gif=00;35:*.bmp=00;35:*.xbm=00;35:*.xpm=00;35:*.png=00;35:*.tif=00;35:'
|
|
|
|
|
|
+
|
|
|
#############
|
|
|
# SSH AGENT #
|
|
|
#############
|
|
|
@@ -119,6 +120,7 @@ if [ `uname` != Darwin ]; then
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
+
|
|
|
#############
|
|
|
# FUNCTIONS #
|
|
|
#############
|
|
|
@@ -130,7 +132,7 @@ calc() { echo "$@" | bc -l -q -i }
|
|
|
dont() { echo "OK, I won't!" }
|
|
|
settab() { echo -ne "\e]1;$1\a" }
|
|
|
settabh() { settab `hostname | cut -d. -f1` }
|
|
|
-#'"
|
|
|
+
|
|
|
|
|
|
###########
|
|
|
# ALIASES #
|
|
|
@@ -182,41 +184,12 @@ alias o.='open .'
|
|
|
alias upd='cvs -q upd -dP'
|
|
|
alias upd-head='cvs -q upd -dPA'
|
|
|
|
|
|
-#alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
|
|
|
-#alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'
|
|
|
-#alias guantanamo-stop='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k stop'
|
|
|
-#alias guantanamo-check='chroot /jails/guantanamo /usr/local/apache2/bin/apachectl -t'
|
|
|
-
|
|
|
-#alias woomera-start='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k start'
|
|
|
-#alias woomera-graceful='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k graceful'
|
|
|
-#alias woomera-stop='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k stop'
|
|
|
-#alias woomera-check='chroot /jails/woomera /usr/local/apache2/bin/apachectl -t'
|
|
|
-
|
|
|
-#alias littlehey-start='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k start'
|
|
|
-#alias littlehey-graceful='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k graceful'
|
|
|
-#alias littlehey-stop='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k stop'
|
|
|
-#alias littlehey-check='chroot /jails/littlehey /usr/local/apache2/bin/apachectl -t'
|
|
|
-
|
|
|
-#alias alcatraz-start='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k start'
|
|
|
-#alias alcatraz-graceful='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k graceful'
|
|
|
-#alias alcatraz-stop='env -i /usr/sbin/chroot /jails/alcatraz /usr/local/apache2/bin/httpd -k stop'
|
|
|
-#alias alcatraz-check='chroot /jails/alcatraz /usr/local/apache2/bin/apachectl -t'
|
|
|
-
|
|
|
-#alias kerobokan-start='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k start'
|
|
|
-#alias kerobokan-graceful='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k graceful'
|
|
|
-#alias kerobokan-stop='env -i /usr/sbin/chroot /jails/kerobokan /usr/local/apache2/bin/httpd -k stop'
|
|
|
-#alias kerobokan-check='chroot /jails/kerobokan /usr/local/apache2/bin/apachectl -t'
|
|
|
-
|
|
|
-#alias changi-start='/etc/init.d/tc-chroot start'
|
|
|
-#alias changi-stop='/etc/init.d/tc-chroot stop'
|
|
|
-
|
|
|
-# If I am on the mac,
|
|
|
+# update locate data for mac
|
|
|
if [ `uname` = Darwin ]; then
|
|
|
alias updatedb='sudo /usr/libexec/locate.updatedb'
|
|
|
fi
|
|
|
|
|
|
## common typos
|
|
|
-#alias sl='ls' #commented out because Jaf's steam train /usr/bin/sl much more fun
|
|
|
alias vf='cd'
|
|
|
alias xs='cd'
|
|
|
alias ks='ls'
|
|
|
@@ -225,35 +198,10 @@ alias ecgi='echo'
|
|
|
## ensure X11 is running when I gvim, xterm etc
|
|
|
alias xterm='open -a X11 && /usr/X11R6/bin/xterm -sb -sl 5000 -rightbar -fg white -bg black -geometry 100x50+40+20'
|
|
|
alias gvim='open -a X11 && vim -g'
|
|
|
-## on the other hand, don't try and connect to X when I am not gvimming
|
|
|
-#alias vim='vim -X'
|
|
|
-#alias x='open -a X11'
|
|
|
|
|
|
settabh
|
|
|
|
|
|
-## shortcuts to other machines
|
|
|
-alias murray='ssh weiyi@murray'
|
|
|
-alias nile='ssh weiyi@nile'
|
|
|
-alias niles='ssh weiyi@nile-stage'
|
|
|
-alias orinoco='ssh weiyi@orinoco'
|
|
|
-alias orinocos='ssh weiyi@orinoco-stage'
|
|
|
-alias kwai='ssh weiyi@kwai'
|
|
|
-alias devbox='ssh root@devbox'
|
|
|
-alias dev5='ssh root@dev5'
|
|
|
-alias danshui='ssh weiyi@danshui'
|
|
|
-alias elrond='ssh weiyi@elrond'
|
|
|
-alias samwise='ssh weiyi@samwise'
|
|
|
-alias tfine='ssh cinaeco@tfine'
|
|
|
-alias blackomelette='ssh cinaeco@10.0.1.1'
|
|
|
-
|
|
|
-## shortcuts for development
|
|
|
-alias migrate='li3 migration db:migrate'
|
|
|
-alias oars-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
|
|
|
-alias schools-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/schools-phplog'
|
|
|
-alias delivery-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/delivery-phplog'
|
|
|
-alias cdo='cd /jails/alcatraz/usr/local/www/oars'
|
|
|
-alias cds='cd /jails/alcatraz/usr/local/www/schools'
|
|
|
-alias cdd='cd /jails/alcatraz/usr/local/www/delivery'
|
|
|
-alias sqlo='mysql -u oars -p'
|
|
|
-
|
|
|
-
|
|
|
+## include any settings specific to this machine
|
|
|
+if [[ -r ~/.zshlocal ]]; then
|
|
|
+ source ~/.zshlocal
|
|
|
+fi
|