dotfiles

commit 7f621de85a89880670d068842cc46ff09b6d5c3a
parent 8fbd800ed28ca1ce00f9d25dcd004558f41e33d6
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date:   Tue,  2 Apr 2013 18:01:46 -0700

Merge branch 'master' of https://github.com/anders-dc/dotfiles

Diffstat:
M
.bashrc
 | 
12
++++++++----
M
.tmux.conf
 | 
10
++++++++++
M
.zshrc
 | 
5
++++-

3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.bashrc b/.bashrc
@@ -72,9 +72,13 @@ export HISTTIMEFORMAT='%F %T '
 export EDITOR=vim
 
 if [ `hostname` == "adc-stationary" ]; then
-  # CUDA 
-  export PATH=/usr/bin:$PATH
-  export LD_LIBRARY_PATH=/usr/lib64:/usr/lib:$LD_LIBRARY_PATH
+  # CUDA 4.2 (installed with apt-get)
+  #export PATH=/usr/bin:$PATH
+  #export LD_LIBRARY_PATH=/usr/lib64:/usr/lib:$LD_LIBRARY_PATH
+
+  # CUDA 5.0 (installed with `sudo sh cuda_5.0.35_linux_64_ubuntu11.10-1.run -override`)
+  export PATH=/usr/local/cuda-5.0/bin:$PATH
+  export LD_LIBRARY_PATH=/usr/local/cuda-5.0/lib64:/usr/local/cuda-5.0/lib:$LD_LIBRARY_PATH
 
   # ESyS-Particle
   export PATH=/usr/local/bin:$PATH
@@ -108,4 +112,4 @@ if [ `hostname` == "master" ] ||
   export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/lib:$LD_LIBRARY_PATH 
 fi
 
-
+#source /home/adc/OpenFOAM/OpenFOAM-2.1.1/etc/bashrc
diff --git a/.tmux.conf b/.tmux.conf
@@ -3,6 +3,16 @@ set-option -g prefix C-a
 bind-key C-w last-window  # Go to last window with C-a C-w
 bind-key C-a last-pane    # Go to last pane with C-a C-a
 
+setw -g mode-keys vi
+
+# vi-like text yanking in copy mode
+#unbind [
+#bind Escape copy-mode
+unbind p
+bind p paste-buffer
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy 'y' copy-selection
+
 # vi-like movement
 bind-key k select-pane -U
 bind-key j select-pane -D
diff --git a/.zshrc b/.zshrc
@@ -39,6 +39,7 @@ source $ZSH/oh-my-zsh.sh
 
 # set vi-like movement
 set -o vi
+export EDITOR=vim
 
 # Add local bin folder to path
 export PATH=$HOME/bin:$PATH
@@ -48,7 +49,9 @@ export PATH=~/.gem/ruby/1.9.1/bin:$PATH
 export PATH=~/code/julia:$PATH
 export PATH=~/code/elmerfem/fem/src:$PATH
 
-export EDITOR=vim
+# CUDA 5.0 (installed with `sudo sh cuda_5.0.35_linux_64_ubuntu11.10-1.run -override`)
+export PATH=/usr/local/cuda-5.0/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/cuda-5.0/lib64:/usr/local/cuda-5.0/lib:$LD_LIBRARY_PATH
 
 alias ll='ls -lh'