merge on laptop

.bash_profile

@@ -1,31 +1,10 @@
 # .bash_profile
 # Brian Zimmer, bmzimmer@eecs.berkeley.edu
 
-# Instructional machines
-#[[ -e /share/b/bin/instructional.bashrc ]] && . /share/b/bin/instructional.bash_profile                                                                       
-
-
 # Paths (not in bashrc, only want to set once)
 # -------
 export PATH=~/bin:$PATH
 
-# BWRC
-# ----
-#export PATH=/tools/mathworks/matlab2009b/etc:/tools/mathworks/matlab2009b/bin/:$PATH
-#export MOSEKLM_LICENSE_FILE=/tools/designs/Dcdg/users/sengoon/mosek/6/licenses 
-# home directory bin
-
-
-# CS250
-# -----
-#source ~cs250/tools/cs250.bashrc
-
-#export STOW_ROOT="/home/aa/grad/bmzimmer/install"
-#export STOW_PREFIX="${STOW_ROOT}/${STOW_ARCH}"
-#export PATH=$STOW_ROOT/riscv/bin:$STOW_PREFIX/bin:$PATH
-#export PATH=/opt/local/bin:/opt/local/sbin:$PATH
-
-
 # Terminal settings
 export EDITOR="gvim"
 # turn on color

.bash_profile.bwrc

@@ -0,0 +1,28 @@
+# .bash_profile
+# Brian Zimmer, bmzimmer@eecs.berkeley.edu
+
+# Paths (not in bashrc, only want to set once)
+# -------
+export PATH=~/bin:$PATH
+
+# BWRC
+# ----
+export PATH=/tools/mathworks/matlab2009b/etc:/tools/mathworks/matlab2009b/bin/:$PATH
+export MOSEKLM_LICENSE_FILE=/tools/designs/Dcdg/users/sengoon/mosek/6/licenses 
+# home directory bin
+export LD_LIBRARY_PATH=/tools/designs/Dcdg/users/bmzimmer/install/mosek/6/tools/platform/linux64x86/bin:$LD_LIBRARY_PATH
+#TODO: Need?
+export LD_LIBRARY_PATH=/tools/designs/Dcdg/users/sengoon/lib/lib:$LD_LIBRARY_PATH
+source /tools/flexlm/flexlm.sh
+
+
+# Terminal settings
+export EDITOR="gvim"
+# turn on color
+export CLICOLOR=1
+
+# Load bashrc as well to get the rest of my settings
+# Must be at the bottom so bash completion loaded after paths
+if [ -f ~/.bashrc ]; then
+        . ~/.bashrc
+fi

.bash_profile.icluster

@@ -0,0 +1,38 @@
+# .bash_profile
+# Brian Zimmer, bmzimmer@eecs.berkeley.edu
+
+# Instructional machines
+[[ -e /share/b/bin/instructional.bashrc ]] && . /share/b/bin/instructional.bash_profile                                                                       
+
+
+# Paths (not in bashrc, only want to set once)
+# -------
+export PATH=~/bin:$PATH
+
+# BWRC
+# ----
+#export PATH=/tools/mathworks/matlab2009b/etc:/tools/mathworks/matlab2009b/bin/:$PATH
+#export MOSEKLM_LICENSE_FILE=/tools/designs/Dcdg/users/sengoon/mosek/6/licenses 
+# home directory bin
+
+
+# CS250
+# -----
+source ~cs250/tools/cs250.bashrc
+
+#export STOW_ROOT="/home/aa/grad/bmzimmer/install"
+#export STOW_PREFIX="${STOW_ROOT}/${STOW_ARCH}"
+#export PATH=$STOW_ROOT/riscv/bin:$STOW_PREFIX/bin:$PATH
+#export PATH=/opt/local/bin:/opt/local/sbin:$PATH
+
+
+# Terminal settings
+export EDITOR="gvim"
+# turn on color
+export CLICOLOR=1
+
+# Load bashrc as well to get the rest of my settings
+# Must be at the bottom so bash completion loaded after paths
+if [ -f ~/.bashrc ]; then
+        . ~/.bashrc
+fi

.bashrc

@@ -138,7 +138,8 @@ export PROMPT_COMMAND="history -n; history -a"
 # If start typing a command, then this will
 # find all commands that start with this
 bind '"\e[A":history-search-backward'
-bind '"\e[B":history-search-forward'
+bind '"\C-l":history-search-backward'
+bind '"\e[B":history-search-backward'
 # Trick: Ctrl-P will go back commands
 # Trick: Ctrl-R will search history
 

.gitignore

@@ -0,0 +1 @@
+.bash_profile

.vim/bundle/align/.VimballRecord

@@ -0,0 +1 @@
+Align.vba: call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/plugin/AlignPlugin.vim')|call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/plugin/AlignMapsPlugin.vim')|call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/plugin/cecutil.vim')|call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/doc/Align.txt')|call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/autoload/Align.vim')|call delete('/home/aa/grad/bmzimmer/.vim/bundle/align/autoload/AlignMaps.vim')