Skip to content

Commit

Permalink
Adding gitconfig and zshrc
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien Saunier committed Oct 1, 2012
1 parent 0229200 commit 1786b2d
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 0 deletions.
34 changes: 34 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Install
-------

[fork this repo](https://github.com/ssaunier/dotfiles#fork_box) on Github.

git clone [email protected]:#{you}/dotfiles.git
cd dotfiles
./install.sh

There is configuration for `zsh` so switch your shell from the default `bash` to `zsh` on OS X:

chsh -s /bin/zsh

Oh-my-zsh plugins used:

mkdir -p ~/.oh-my-zsh/custom/plugins && cd ~/.oh-my-zsh/custom/plugins
git clone git://github.com/zsh-users/zsh-syntax-highlighting.git
git clone git://github.com/zsh-users/zsh-history-substring-search.git


Customization
-------------

You will want to customize your environment. We suggest making changes in files that are not in thoughtbot's files.

For example, to customize your `zsh` config, make your changes in `~/.zshenv`:

# RVM
[[ -s '/Users/ssaunier/.rvm/scripts/rvm' ]] && source '/Users/ssaunier/.rvm/scripts/rvm'

# recommended by brew doctor
export PATH="/usr/local/bin:/usr/local/sbin:$PATH"

Readme based on https://raw.github.com/thoughtbot/dotfiles/master/README.md
17 changes: 17 additions & 0 deletions gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[color]
ui = true
[core]
editor = vim
[alias]
co = checkout
st = status
br = branch
[user]
name = Sébastien Saunier
mail = [email protected]
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
13 changes: 13 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
for name in *; do
target="$HOME/.$name"
if [ -e "$target" ]; then
if [ ! -L "$target" ]; then
echo "WARNING: $target exists but is not a symlink."
fi
else
if [ "$name" != 'install.sh' ] && [ "$name" != 'README.md' ]; then
echo "Symlinking to $target"
ln -s "$PWD/$name" "$target"
fi
fi
done
36 changes: 36 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh

# Set name of the theme to load.
# 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="eastwood"

# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"

# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"

# Comment this out to disable weekly auto-update checks
# DISABLE_AUTO_UPDATE="true"

# Uncomment following line if you want to disable colors in ls
# DISABLE_LS_COLORS="true"

# Uncomment following line if you want to disable autosetting terminal title.
# DISABLE_AUTO_TITLE="true"

# Uncomment following line if you want red dots to be displayed while waiting for completion
COMPLETION_WAITING_DOTS="true"

# 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/
plugins=(git osx ruby bundler rails3 rvm sublime zsh-syntax-highlighting zsh-history-substring-search)

source $ZSH/oh-my-zsh.sh
export PATH='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11/bin:~/bin'

unsetopt correct_all

0 comments on commit 1786b2d

Please sign in to comment.