Updates'

bash_profile

@@ -52,8 +52,8 @@ export GH_LOGIN=stephenway
 GIT_PS1_SHOWDIRTYSTATE=true
 export COMMAND_MODE=unix2003;
 export BROWSER=open;
-export PKGIN_PREFIX="/opt/pkg"
-export ZOPFLI="$PKGIN_PREFIX/bin/zopfli"
+export PKGIN_PREFIX="/opt/pkg";
+export ZOPFLI="$PKGIN_PREFIX/bin/zopfli";
 
 ## Bash Git Prompt
 if [ -f "$(brew --prefix)/opt/bash-git-prompt/share/gitprompt.sh" ]; then
@@ -68,13 +68,15 @@ export MVIM_BINARY="/usr/local/bin/mvim";
 export VIMRC="$HOME/.vimrc";
 
 ## Node
-export NODE_ENV=development
+export NODE_ENV="development";
 export NODE_PATH="/usr/local/lib/node_modules";
 
+## NVM
+## TODO: Remove this
+export NVM_DIR="$HOME/.nvm"
+. "/usr/local/opt/nvm/nvm.sh"
+
 ## GPG Keys
 export GPG_TTY=$(tty)
 
-eval $(/usr/libexec/path_helper -s)
-
-## Clojure
-LEIN_SNAPSHOTS_IN_RELEASE=false
+eval $(/usr/libexec/path_helper -s)

bashrc

@@ -63,7 +63,7 @@ t() {
 # NPM
 
 # Use yarn when yarn.lock is detected
-alias npm=prioritize-yarn
+# alias npm=prioritize-yarn
 
 n() {
  if [[ $1 == "i" ]]; then

gitconfig

@@ -19,7 +19,7 @@
  # Clone a repository including all submodules
  cr = clone --recursive
  # Show the diff between the latest commit and the current state
- d = !"git diff-index --quiet HEAD -- || clear && git --no-pager diff --patch-with-stat"
+ d = !"git diff-index -w --quiet HEAD -- || clear && git --no-pager diff --patch-with-stat"
  # `git di $number` shows the diff between the state `$number` revisions ago and the current state
  di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
  # Remove branches that have been merged with master
@@ -42,6 +42,8 @@
  p = !"git pull && git submodule foreach git pull origin master"
  # Push with origin
  pu = push -u
+ # Sync branch remote to quickly pull origin
+ ps = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
  # Rebase on a remote branch
  rb = "!git pull --rebase origin \"$1\""
  # Continue rebase

ssh/config

@@ -25,7 +25,7 @@ Host server
 Host gitlab
  HostName gitlab.buehner-fry.com
  User SCWay
- RSAAuthentication yes
+ PubkeyAuthentication yes
  IdentityFile ~/.ssh/id_rsa
  IdentitiesOnly yes