updates fish and zsh stuff for new brew, keychain, etc. changens to fish shell in emacs multi-term

.gitignore

@@ -5,3 +5,4 @@
 # Vim
 vim/.netrwhist
 vim/plugged/*
+node_modules

config.fish

@@ -40,7 +40,7 @@ set -x PATH $HOME/.npm-packages/bin $PATH
 if status --is-interactive
     # TODO Take this out when keychain fixes this bug
     set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
-    eval (keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377)
+    keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
 end
 
 # iTerm2

spacemacs

@@ -64,7 +64,7 @@ values."
      (org :variables org-enable-github-support t)
      deft
      ;; (shell :variables shell-default-term-shell "/Users/dustinswan/.nix-profile/bin/zsh")
-     (shell :variables shell-default-term-shell "/usr/local/bin/zsh" shell-default-shell 'multi-term)
+     (shell :variables shell-default-term-shell "/usr/local/bin/fish" shell-default-shell 'multi-term)
      xkcd
      spotify
      finance

zshrc

@@ -57,10 +57,6 @@ if [ -x "$(command -v keychain)" ]; then
     eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377`
 fi
 
-# Homebrew Github Token
-[ -x "$(command -v brew)" ] && alias brew='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; brew'
-[ -x "$(command -v carthage)" ] && alias carthage='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; carthage'
-
 # FZF
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh