diff --git a/.zsh/rc/defaults/.zshrc b/.zsh/rc/defaults/.zshrc deleted file mode 100644 index 02562dc..0000000 --- a/.zsh/rc/defaults/.zshrc +++ /dev/null @@ -1,73 +0,0 @@ -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. Case -# sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. - - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/rsa_id" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - diff --git a/.zsh/rc/emma/.zshrc b/.zsh/rc/emma/.zshrc index 88a25a7..6bbb228 100644 --- a/.zsh/rc/emma/.zshrc +++ b/.zsh/rc/emma/.zshrc @@ -20,3 +20,7 @@ eval "$(rbenv init -)" alias elog='lemma kick_apache; ssh emma27 -tt "tail -f /var/log/apache2/apache2-errors.log"' alias pg='psql -h localhost -p 5432 -d exports -U exports' alias pg_deploy='SQITCH_PASSWORD=emmainc sqitch -h localhost -p 5432 -u exports -d exports --engine pg deploy' + +#For Managing Python Versions +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" diff --git a/.zsh/rc/sdc/.zshrc b/.zsh/rc/sdc/.zshrc deleted file mode 100644 index af99986..0000000 --- a/.zsh/rc/sdc/.zshrc +++ /dev/null @@ -1,40 +0,0 @@ -export NVM_DIR="$HOME/.nvm" - . "/usr/local/opt/nvm/nvm.sh" -If you come from bash you might have to change your $PATH. -export PATH=$HOME/bin:/usr/local/bin:$PATH - source `which activate.sh` - export WORKON_HOME=~/.virtualenvs -export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python -export WORKON_HOME=~/.virtualenvs -source /usr/local/bin/virtualenvwrapper.sh -VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python3 -export CRYPTOGRAPHY_ALLOW_OPENSSL_098=1 -alias glog="git log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" -alias sc='workon smilecheck' -alias ur="git remote update upstream --prune" -alias reqs='pushd ~/dev/scc-api && pip install -r requirements.txt && popd' -alias pup='pushd ~/dev/scc-api/smilecheck && ./manage.py migrate --noinput && popd' -alias pmnpm='pushd ~/dev/scc-api/smilecheck && ./manage.py npm && popd' -alias pmr='./manage.py runserver' -alias restore_data='./manage.py restore_data' -alias freshdev="sc && ur && git co develop && git pull upstream develop && reqs && pup && pmnpm && cd ~/dev/scc-api/smilecheck" -alias pmt="SCCENVIRONMENT=test ./manage.py test --keepdb --noinput --verbosity=2" -alias pmt4="SCCENVIRONMENT=test ./manage.py test --keepdb --noinput --verbosity=2 --parallel=4" -alias pmtc="SCCENVIRONMENT=test ./manage.py test --noinput --verbosity=2" -alias pmt4c="SCCENVIRONMENT=test ./manage.py test --noinput --verbosity=2 --parallel=4" - alias mvim='/Applications/MacVim.app/Contents/MacOS/MacVim' - OSX -alias ll='ls -la' -alias hidefiles='defaults write com.apple.finder AppleShowAllFiles 0 && killall Finder' -alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE && killall Finder' - Opens the github page for the current git branch in your browser -gh() { - giturl=$(git config --get remote.upstream.url) - giturl=${giturl/git\@github\.com\:/https://github.com/} - giturl=${giturl/\.git/} - branch="$(git symbolic-ref HEAD 2>/dev/null)" - branch=${branch##refs/heads/} - giturl=$giturl\/"tree"\/$branch - open $giturl -} -export PATH=/Users/$USER/.virtualenvs/smilecheck/bin:/Users/$USER/bin:/Users/$USER/.vimpkg/bin diff --git a/.zshrc b/.zshrc index 38a0c8b..645d776 100644 --- a/.zshrc +++ b/.zshrc @@ -14,6 +14,13 @@ alias p2='workon p2' source $ZSH/oh-my-zsh.sh source /Users/$USER/dotfiles/.zsh/rc/emma/.zshrc +# remove these when not needed to use member-sync +export POSTGRES_DB=sync +export POSTGRES_USER=sync +export POSTGRES_PASSWORD=emmainc +export PGDATA=/var/lib/postgresql/data/pgdata +# remove these when not needed to use member-sync + source ~/.nvm/nvm.sh export WORKON_HOME=$HOME/.virtualenvs export PROJECT_HOME=$HOME/dev