summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.profile6
-rw-r--r--.ssh/config18
2 files changed, 22 insertions, 2 deletions
diff --git a/.profile b/.profile
index c035f77..708b951 100644
--- a/.profile
+++ b/.profile
@@ -35,7 +35,7 @@ alias ls="ls --color=auto"
alias xterm_="xterm -rv +sb -ls"
alias q3="quake3-smp"
#alias scipy = "ipython -pylab"
-alias chromium="chromium-browser"
+#alias chromium="chromium-browser"
alias vbox="VBOX_USB=USBFS VirtualBox"
# arm-gcc codesourcery stuff
@@ -52,6 +52,10 @@ alias pe="cd ~/code/pdfextract; source bin/activate; cd src"
alias aws="read -s AWS_ACCESS_KEY AWS_SECRET_ACCESS_KEY && export AWS_ACCESS_KEY && export AWS_SECRET_ACCESS_KEY"
alias start_thriftdb="/var/lib/thriftdb-index/tomcat/thriftdb__development/bin/startup.sh"
+alias xilinx="source /opt/Xilinx/14.3/ISE_DS/settings64.sh"
+alias adelie="mosh adelie -- screen -x"
+
+alias ack=ack-grep
export GOROOT=/usr/local/go
export PATH=$PATH:$GOROOT/bin
diff --git a/.ssh/config b/.ssh/config
index e921022..9443976 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -35,10 +35,22 @@ Host fajitta
Host flauta
HostName flauta.berkeley.edu
User polarbear
-Host leaf
+Host bamboo
HostName 69.164.217.230
Port 2269
User bnewbold
+Host leaflabs.com
+ HostName kelp.leaflabs.com
+ User bnewbold
+ Port 484
+Host kelp
+ HostName kelp.leaflabs.com
+ User bnewbold
+ Port 484
+Host durian
+ HostName durian.leaflabs.com
+ User bnewbold
+ Port 484
Host leaf_rsync
HostName ch-s010.rsync.net
User 10009
@@ -141,3 +153,7 @@ Host rooter
User root
Host ttt.rooter.is
Port 2222
+Host factory
+ HostName factory.numm.org
+ Port 2204
+