dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dustin Swan 2017-05-07 11:58:39 -04:00
parent a28b86dc4a
commit 7356eac3a7
4 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

2
config.fish
View file

@ -40,7 +40,7 @@ set -x PATH $HOME/.npm-packages/bin $PATH
if status --is-interactive if status --is-interactive
# TODO Take this out when keychain fixes this bug # TODO Take this out when keychain fixes this bug
set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1" 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 end
# iTerm2 # iTerm2

2
spacemacs
View file

@ -64,7 +64,7 @@ values."
(org :variables org-enable-github-support t) (org :variables org-enable-github-support t)
deft deft
;; (shell :variables shell-default-term-shell "/Users/dustinswan/.nix-profile/bin/zsh") ;; (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 xkcd
spotify spotify
finance finance

4
zshrc
View file

@ -57,10 +57,6 @@ if [ -x "$(command -v keychain)" ]; then
eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377` eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377`
fi 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 # FZF
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh