diff options
| author | jason | 2017-01-17 22:41:59 -0700 |
|---|---|---|
| committer | jason | 2017-01-17 22:41:59 -0700 |
| commit | bd586aebccbb299752ad5013902ab39017a17a46 (patch) | |
| tree | d14c52b1e602e10e2f5b4af81b68851f13a3298a | |
| parent | 5e0dcf5056c68fc8883381ea647c349499b23c7b (diff) | |
| download | dotfiles-bd586aebccbb299752ad5013902ab39017a17a46.tar.gz dotfiles-bd586aebccbb299752ad5013902ab39017a17a46.zip | |
update zshrc
| -rwxr-xr-x[-rw-r--r--] | zshrc | 13 |
1 files changed, 6 insertions, 7 deletions
| @@ -78,21 +78,20 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects | |||
| 78 | 78 | ||
| 79 | alias fixfileperm='find /music -type f -exec chmod 0644 {} \;' | 79 | alias fixfileperm='find /music -type f -exec chmod 0644 {} \;' |
| 80 | alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin' | 80 | alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin' |
| 81 | alias bib='source ~/.virtualenvs/bib/bin/activate' | 81 | |
| 82 | alias ducks='du -cks * |sort -rn |head -11' | 82 | alias ducks='du -cks * |sort -rn |head -11' |
| 83 | source /usr/share/virtualenvwrapper/virtualenvwrapper.sh | 83 | source /usr/local/bin/virtualenvwrapper.sh |
| 84 | 84 | ||
| 85 | # emacsclient is a script located in ~/bin | 85 | # emacsclient is a script located in ~/bin |
| 86 | alias emacs='emacsclient -nw' | 86 | alias emacs='emacsclient -nw' |
| 87 | |||
| 87 | alias dc='docker-compose' | 88 | alias dc='docker-compose' |
| 89 | |||
| 88 | #. ~/.cargo/env | 90 | #. ~/.cargo/env |
| 89 | eval "$(direnv hook zsh)" | 91 | eval "$(direnv hook zsh)" |
| 90 | 92 | ||
| 91 | if [ -f "${HOME}/.gpg-agent-info" ]; then | 93 | export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" |
| 92 | . "${HOME}/.gpg-agent-info" | 94 | |
| 93 | export GPG_AGENT_INFO | ||
| 94 | export SSH_AUTH_SOCK | ||
| 95 | fi | ||
| 96 | export GPG_TTY=$(tty) | 95 | export GPG_TTY=$(tty) |
| 97 | export COMPOSE_HTTP_TIMEOUT=600 | 96 | export COMPOSE_HTTP_TIMEOUT=600 |
| 98 | export DOCKER_CLIENT_TIMEOUT=120 | 97 | export DOCKER_CLIENT_TIMEOUT=120 |