Update dotfiles with new goodies

README.md

@@ -5,35 +5,19 @@ Install
 
 Your dotfiles are personal. [Fork this repo](https://github.com/lewagon/dotfiles/fork) on Github, and then clone it on your computer.
 
-```bash
-# Create a global variable storing
-# You need to replace what's *after* the equal sign by your own github username (case sensitive)
-#
-# e.g.: GITHUB_USERNAME=ssaunier
-#
-$ GITHUB_USERNAME=put_your_github_username_here
 ```
+# Don't copy paste this line, type it and put *your*
+$ GITHUB_USERNAME=my_github_username
 
-Then execute the 3 following lines **without changing** anything:
-
-```
-$ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
-$ git clone [email protected]:$GITHUB_USERNAME/dotfiles.git
-$ cd dotfiles
-```
-
-Run the `dotfiles` installer:
-
-```bash
-$ ./install.sh
+# Sure you did not just copy paste the previous line? Sure? OK go on!
+# You can copy paste this line *without changing anything*
+$ mkdir -p ~/code/$GITHUB_USERNAME && cd $_ && git clone [email protected]:$GITHUB_USERNAME/dotfiles.git && cd dotfiles
 ```
 
-Some files have been updated, you should push this changes back to GitHub.
+Run the `dotfiles` installer. It will prompt you for your name and your email.
 
 ```bash
-$ git add gitconfig
-$ git commit --message "My identity for @lewagon in the gitconfig"
-$ git push origin master
+$ zsh install.sh
 ```
 
 You're all set! Go back to [lewagon/setup](https://github.com/lewagon/setup)

aliases

@@ -5,11 +5,3 @@ alias speedtest="wget -O /dev/null http://speedtest.wdc01.softlayer.com/download
 
 # Quickly serve the current directory as HTTP
 alias serve='ruby -run -e httpd . -p 8000'  # Or python -m SimpleHTTPServer :)
-
-# Rails bundler shorter
-alias be='bundle exec'
-alias bi='bundle install'
-
-# Open Sublime Text with a very short command!
-alias s='st .'
-

gitconfig

@@ -12,9 +12,8 @@
   remote = yellow
 
 [core]
-  editor = subl -n -w
+  editor = '/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl' -n -w
   pager = less -FRSX
-  mergeoptions = --no-edit
 
 [alias]
   co = checkout
@@ -46,3 +45,6 @@
 
 [push]
 	default = simple
+
+[branch "master"]
+  mergeoptions = --no-edit

install.sh

@@ -37,17 +37,26 @@ fi
 cd "$CURRENT_DIR"
 
 
-echo "Type in your full name (no accent / special chars):"
+echo "Type in your first and last name (no accent or special characters - e.g. 'ç'): "
 read full_name
-echo "Type in your email address (the one used for your GitHub account):"
+echo "Type in your email address (the one used for your GitHub account): "
 read email
 git config --global user.email $email
 git config --global user.name $full_name
 
+setopt nocasematch
+if [[ ! `uname` =~ "darwin" ]]; then
+  git config --global core.editor "subl -n -w"
+fi
 
-zsh ~/.zshrc
+git add gitconfig
+git commit --message "My identity for @lewagon in the gitconfig"
+git push origin master
 
-# Setting Sublime Text as main editor and git editor
-# subl_path=`alias subl | grep -o '\(/[a-zA-Z0-9. ]\+\)\+'`
-# git config --global core.editor "'$subl_path' -n -w"
+zsh ~/.zshrc
 
+if [[ `uname` =~ "darwin" ]]; then
+  echo "Quit your terminal (⌘ + Q) and restart it."
+else
+  echo "Quit your terminal (Alt + F4) and restart it."
+fi

zshrc

@@ -10,7 +10,7 @@ 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 sublime zsh-syntax-highlighting zsh-history-substring-search)
+plugins=(gitfast brew rbenv last-working-dir common-aliases sublime bundler zsh-syntax-highlighting zsh-history-substring-search)
 
 source $ZSH/oh-my-zsh.sh
 export PATH='/usr/local/bin:/usr/local/share:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:/usr/X11/bin:/usr/texbin:~/bin'