Lots of updates

.config/zsh/fnm.zsh

@@ -1,5 +1,5 @@
 export PATH=/home/ted/.fnm:$PATH
-eval "`fnm env`"
+eval "$(fnm env --use-on-cd)"
 
 autoload -U add-zsh-hook
 _fnm_autoload_hook () {

.config/zsh/git.zsh

@@ -1,16 +1,33 @@
 alias ghm='git push heroku master'
 alias gpp='git pull origin "(git_current_branch)" && git push origin "(git_current_branch)"'
+alias gfap='git pull --all -p'
+
+function gctest () {
+  local branch="${1:-master}"
+
+  git merge --no-commit --no-ff $1
+  git merge --abort
+}
 
 function grcl () {
     local branch="${1:-master}"
 
-    echo git checkout $branch
-    echo git pull
-    echo git remote prune origin
-    echo git branch -avv | grep "gone]" | awk '{ print $1 }' | xargs git branch -d;
+    git checkout $branch
+    gfap
+    git remote prune origin
+    git branch -avv | grep "gone]" | awk '{ print $1 }' | xargs git branch -d;
 }
 
-alias gie='git init && git commit --allow-empty -m "Initial commit"'
+unset gie
+function gie () {
+  local email="${1:-ted@tedkulp.com}"
+
+  git init
+  git config user.email "$email"
+  git commit --allow-empty -m "Initial Commit"
+}
+
+# alias gie='git init && git commit --allow-empty -m "Initial commit"'
 
 # alias __git-checkout_main=_git_checkout
 # compdef _git grcl=git-checkout

.config/zsh/keychain.zsh

@@ -1 +0,0 @@
-keychain.zsh##os.WSL

.config/zsh/nvm.zsh

@@ -2,21 +2,21 @@
 
 # declare -a NODE_GLOBALS=(`find $NVM_DIR/versions/node -maxdepth 3 -type l -wholename '*/bin/*' | xargs -n1 basename | sort | uniq`)
 
-NODE_GLOBALS+=("node")
-NODE_GLOBALS+=("nvm")
+# NODE_GLOBALS+=("node")
+# NODE_GLOBALS+=("nvm")
 
-load_nvm () {
-  if [ -s "$NVM_DIR/nvm.sh" ]; then
-    # These are the ones when using curl install
-    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-    [ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-  elif [ -x "$(command -v brew)" ]; then
-    export NVM_PREFIX=$(brew --prefix nvm)
-    # These are the homebrew ones
-    [ -s "$NVM_PREFIX/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
-    [ -s "$NVM_PREFIX/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
-  fi
-}
+# load_nvm () {
+#   if [ -s "$NVM_DIR/nvm.sh" ]; then
+#     # These are the ones when using curl install
+#     [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+#     [ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+#   elif [ -x "$(command -v brew)" ]; then
+#     export NVM_PREFIX=$(brew --prefix nvm)
+#     # These are the homebrew ones
+#     [ -s "$NVM_PREFIX/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
+#     [ -s "$NVM_PREFIX/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+#   fi
+# }
 
 # for cmd in "${NODE_GLOBALS[@]}"; do
 #     eval "${cmd}(){ unset -f ${NODE_GLOBALS}; load_nvm; ${cmd} \$@ }"