commit 956ab96a61c05d8742442680b7ee3038eef17cf2
parent 2dd0ffdca20149c42fd8fccdfb79e1d9f75e4dbb
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date: Mon, 20 Jun 2016 19:22:28 -0700
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.bashrc b/.bashrc
@@ -58,7 +58,11 @@ alias vi='vim -u NONE'
alias play='mpg123 --title -C'
# Set bash title for certain terminals
#echo -n -e "\033]0;`hostname`\007"
-alias open='xdg-open'
+ARCH=$(uname)
+if [[ "$ARCH" != 'Darwin' ]]; then
+ function open() { xdg-open $1 &> /dev/null &disown; }
+ function say() { echo "$@" | festival --tts; }
+fi
# Dircolors
export CLICOLOR=1
@@ -197,3 +201,4 @@ if [ $(echo $HOSTNAME | grep cosmo) ]; then
fi
[ -d /home/ad/pism ] && export PATH=/home/ad/pism/bin:$PATH
+[ -d ~/code/issm/trunk ] && export ISSM_DIR=~/code/issm/trunk
diff --git a/.zshrc b/.zshrc
@@ -248,3 +248,4 @@ alias sha256sum='shasum -a 256'
[ -f ~/.bash_profile ] && source ~/.bash_profile
[ -d /home/ad/pism ] && export PATH=/home/ad/pism/bin:$PATH
+[ -d ~/code/issm/trunk ] && export ISSM_DIR=~/code/issm/trunk
diff --git a/debian-install.sh b/debian-install.sh
@@ -42,6 +42,7 @@ sudo apt-get install \
okular \
paraview \
pass \
+ python-ipdb \
python-matplotlib \
python-numpy \
python-pip \