Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Installation
------------

``` bash
git clone git://github.com/michaeljsmalley/dotfiles ~/dotfiles
git clone git@github.com:philipmadeley/dotfiles.git ~/dotfiles
cd ~/dotfiles
./makesymlinks.sh
```
48 changes: 46 additions & 2 deletions zshrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Explicitly configured $PATH variable
PATH=/usr/local/git/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/opt/local/bin:/opt/local/sbin:/usr/X11/bin
PATH=/usr/local/git/bin:/usr/local/opt/ruby/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/opt/local/bin:/opt/local/sbin:/usr/X11/bin

# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
Expand All @@ -8,7 +8,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="xiong-chiamiov-plus"
ZSH_THEME="gozilla"

# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"
Expand Down Expand Up @@ -41,9 +41,21 @@ if [ -f $HOME/.profile ]; then
fi

# Shell Aliases
#filesystem
# Filesystem
alias ..='cd ..' # Go up one directory
alias ...='cd ../..' # Go up two directories
alias ....='cd ../../..' # And for good measure
alias l='ls -lah'
alias la='ls -AF'

## Git Aliases
alias gs='git status '
alias ga='git add '
alias gaa='git add .'
alias gcm='git commit -m'
alias gpu='git push'
alias gpl='git pull'
alias gb='git branch '
alias gc='git commit'
alias gd='git diff'
Expand All @@ -52,6 +64,11 @@ alias gk='gitk --all&'
alias gx='gitx --all'
alias got='git '
alias get='git '
alias gdpl='git daily pull'
alias gdpu='git daily push'

#alias for Octopress
alias rake="noglob rake"

# qfind - used to quickly find files that contain a string in a directory
qfind () {
Expand All @@ -64,3 +81,30 @@ qfind () {
if [ -f /usr/bin/vim ]; then
export EDITOR=/usr/bin/vim
fi

# Open Sublime text
alias subl="'/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl'"
alias nano="subl"
export EDITOR="subl"

### Added by the Heroku Toolbelt
# export PATH="/usr/local/heroku/bin:$PATH"

export PATH="$HOME/.rbenv/bin:$PATH"

#for node
export PATH="$HOME/.node/bin:$PATH"

# Path for homebrew (/usr/local/[s]bin)

PATH=/usr/local/bin:/usr/local/sbin:$PATH

# Set up rbenv for Homebrew. Make sure path is BEFORE Homebrew's /usr/local/[s]bin
#To enable shims and autocompletion add to your profile:
if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi

#eval "$(direnv hook zsh)"

#https://github.com/csswizardry/inuit.css/issues/270
export LC_ALL="en_US.UTF-8"
export LANG="en_US.UTF-8"