few additions to bashrc

.bash_local

@@ -231,8 +231,8 @@ unset UVCDAT_SETUP_PATH
 
 echo "ANACONDA:"${ANACONDA_HOME}
 #export PATH=${ANACONDA_HOME}/bin:$PATH
-source ${ANACONDA_HOME}/etc/profile.d/conda.sh
-conda activate
+#source ${ANACONDA_HOME}/etc/profile.d/conda.sh
+#conda activate
 
 
 # Stuff I don't want from Gavin's repo

.bashrc

@@ -0,0 +1,40 @@
+# Moving around
+alias ..="cd .."
+alias ...="cd ../.."
+
+# SPACK
+export SPACK_ROOT=/usr/workspace/cdoutrix/spack
+alias activate_spack=". ${SPACK_ROOT}/share/spack/setup-env.sh"
+
+# CONDA
+export activate_conda="source /g/g19/cdoutrix/miniconda3/bin/activate"
+export activate_amlcs="conda activate /usr/workspace/aml_cs/kosh/toss_3_x86_64_ib/dev"
+
+## Git 
+alias gci="git commit"
+alias gco="git checkout"
+alias gcl='${HOME}/bin/git-clean-local.py -s -V'
+alias gst='git status'
+alias gbr='for branch in `git branch -r | grep -v HEAD`;do echo -e `git show --format="%ci %cr" $branch | head -n 1` \\t$branch; done | sort -r'
+alias gb='for branch in `git branch -r | grep -v HEAD`;do echo -e `git show --format="%ci %cr" $branch | head -n 1` \\t$branch; done | sort'
+
+# Python
+alias pb="python setup.py install"
+alias p="ipython"
+PYTHONSTARTUP=${HOME}/.pythonrc
+JUPYTERLAB_DIR=${HOME}/.jupyter
+
+# Editors
+export EDITOR='vi'
+
+# History
+export HISTCONTROL=erasedups
+export HISTSIZE=1000000
+export HISTFILESIZE=1000000
+export TMOUT=0
+
+# Unix
+alias ls="ls -h"
+alias md="mkdir"
+alias pd="pushd"
+

.gitconfig

@@ -5,6 +5,8 @@
  dry = "!f() { git merge-tree `git merge-base $2 $1` $2 $1; }; f"
  rshw = remote show
  rprn = remote prune
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit
+ lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
 
 [push]
  default = current

setup

@@ -71,7 +71,7 @@ _readlinkf() {
 setup_local_files() {
  [ ! -e .git ] && echo "Sorry this is not a git repo" && exit 1
  local mod_count=0
- local my_dot_files=(.bash_local .gitconfig .emacs .emacs.d .condarc .pythonrc .vimrc .vim .ipython bin)
+ local my_dot_files=(.bashrc .bash_local .gitconfig .emacs .emacs.d .condarc .pythonrc .vimrc .vim .ipython bin)
  mkdir ${homedir}/.vim
  mkdir ${homedir}/bin
  for dot_file in ${my_dot_files[@]}; do