mirror of
https://github.com/genebean/dots.git
synced 2026-03-27 01:17:42 -04:00
Merge branch 'lets-go' of github.com:genebean/dots into lets-go
This commit is contained in:
commit
459617b881
1 changed files with 6 additions and 3 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH=/Users/gliverma/.oh-my-zsh
|
export ZSH=~/.oh-my-zsh
|
||||||
|
|
||||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
# Set name of the theme to load. Optionally, if you set this to "random"
|
||||||
# it'll load a random theme each time that oh-my-zsh is loaded.
|
# it'll load a random theme each time that oh-my-zsh is loaded.
|
||||||
|
|
@ -51,13 +51,13 @@ COMPLETION_WAITING_DOTS="false"
|
||||||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
plugins=(brew bundler gem git git-flow history osx python vagrant)
|
plugins=(brew bundler gem git git-flow gpg-agent history osx python vagrant)
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
# User configuration
|
# User configuration
|
||||||
|
|
||||||
source ~/.private-env
|
[ -f ~/.private-env ] && source ~/.private-env
|
||||||
|
|
||||||
# export MANPATH="/usr/local/man:$MANPATH"
|
# export MANPATH="/usr/local/man:$MANPATH"
|
||||||
|
|
||||||
|
|
@ -71,7 +71,9 @@ source ~/.private-env
|
||||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||||
#alias ll='ls -G -l'
|
#alias ll='ls -G -l'
|
||||||
#alias ls='ls -G'
|
#alias ls='ls -G'
|
||||||
|
alias sal='ssh-add -L'
|
||||||
alias sz='source ~/.zshrc'
|
alias sz='source ~/.zshrc'
|
||||||
|
alias ykey='pkill gpg-agent && source ~/.zshrc && ssh-add -L'
|
||||||
|
|
||||||
export EDITOR='vim'
|
export EDITOR='vim'
|
||||||
export POWERLINE_CONFIG_COMMAND='/usr/local/bin/powerline-config'
|
export POWERLINE_CONFIG_COMMAND='/usr/local/bin/powerline-config'
|
||||||
|
|
@ -82,3 +84,4 @@ export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities
|
||||||
|
|
||||||
# added by travis gem
|
# added by travis gem
|
||||||
[ -f /Users/gliverma/.travis/travis.sh ] && source /Users/gliverma/.travis/travis.sh
|
[ -f /Users/gliverma/.travis/travis.sh ] && source /Users/gliverma/.travis/travis.sh
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue