itmilbe!

Merge branch 'master' of git:https://github.com/doutriaux1/dotfiles

.bash_local

@@ -2,41 +2,19 @@ h=`hostname -s`
 case "$h" in
  vpn*)
  CDATBUILDS="/lgm/uvcdat";;
- maryam)
- CDATBUILDS="/lgm/uvcdat"
- ANACONDA_HOME=${HOME}/anaconda2;;
- meryem)
- CDATBUILDS="/lgm/uvcdat"
- ANACONDA_HOME=${HOME}/anaconda2;;
- omar)
- CDATBUILDS="/lgm/uvcdat"
- ANACONDA_HOME=${HOME}/miniconda2;;
  lapetitechipie*)
  ANACONDA_HOME=/lgm/Anaconda;;
  oceanonly*)
  ANACONDA_HOME=/usr/local/anaconda2;;
  crunchy*)
  ANACONDA_HOME=${HOME}/anaconda2;;
- *il-*)
- CDATBUILDS="/lgm/uvcdat";;
- sofia)
- CDATBUILDS="/lgm/uvcdat"
- ANACONDA_HOME=${HOME}/anaconda2;;
- cab*)
- CDATBUILDS="/usr/gapps/uvcdat/chaos_5_x86_64_ib/default";;
  *Mac*)
  CDATBUILDS="/lgm/uvcdat";;
- *rhea-lo*)
- CDATBUILDS="/lustre/atlas/world-shared/csc121/uvcdat";;
  sierra*)
  CDATBUILDS="/usr/gapps/uvcdat/chaos_5_x86_64_ib/default"
  ANACONDA_HOME=/usr/gapps/uvcdat/anaconda2;;
- loki*)
- ANACONDA_HOME=${HOME}/miniconda3;;
- drdoom*)
- ANACONDA_HOME=${HOME}/miniconda3;;
  *)
- ANACONDA_HOME=${HOME}/anaconda2;;
+ ANACONDA_HOME=${HOME}/miniconda3;;
 esac
 case `uname` in
  Darwin*)

.bashrc

@@ -0,0 +1,41 @@
+# 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 ll="ls -l"
+alias md="mkdir"
+alias pd="pushd"
+

.gitconfig

@@ -1,21 +1,19 @@
-
 [alias]
  dry2 = "!f() { grep -q 'changed in both' < $(git merge-tree $(git merge-base FETCH_HEAD $1) $1 FETCH_HEAD) && echo 'Merge conflict detected' || echo 'Merged cleanly'; }; f"
 
  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
 [user]
- name = Charles Doutriaux
  email = [email protected]
-
-[color]
- ui = auto
-[url "git:https://uv-cdat.llnl.gov/windfield.git"]
- insteadof = http:https://uv-cdat.llnl.gov/git/windfield.git
+ name = Charles Doutriaux
 [http]
+ sslBackend = schannel
  sslVerify = false
-
+[core]
+ autocrlf = false

setup

@@ -21,8 +21,6 @@
 #*****************************************************************
 # Copied from github.com:gavinmbell/bash_resources.git
 
-#TODO - implement revert_homedir function
-#TODO - write arg code to trigger revert if necessary
 
 DEBUG=0
 DRY_RUN=0
@@ -73,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