diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..4f61e84
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,28 @@
+# Path to your oh-my-zsh installation.
+export ZSH=~/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+ZSH_THEME="robbyrussell"
+
+# Uncomment the following line to display red dots whilst 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/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git git-flow capistrano docker fasd ssh-agent)
+
+# User configuration
+
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+source $ZSH/oh-my-zsh.sh
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+export EDITOR='vim'
\ No newline at end of file
diff --git a/dotfiles.yml b/dotfiles.yml
index 5184ee4..5f37741 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -73,20 +73,27 @@
 - name: Setup user settings
   hosts: localhost
   become: no
+  vars:
+    BIN_DIR: "{{ansible_env.HOME}}/bin"
   tasks:
+    - name: ensure a writable "bin" directory exists
+      file: path={{BIN_DIR}} state=directory mode=0755
     - name: ensure Git is properly configured
       template: src=templates/gitconfig.j2 dest={{ansible_env.HOME}}/.gitconfig
+    - name: ensure fasd is installed and configured
+      get_url: url=https://raw.githubusercontent.com/clvv/fasd/master/fasd dest={{BIN_DIR}}/fasd mode=0755
+    - name: ensure dotfiles are available
+      copy: src=.zshrc dest={{ansible_env.HOME}}/.zshrc
 
 # TODO
 # i3 bugfixes:
 #   http://blog.hugochinchilla.net/2013/03/using-gnome-3-with-i3-window-manager/ - usr/share/xsessions/gnome-i3.desktop
 #   ++ http://www.draconianoverlord.com/2014/05/26/from-xmonad-to-i3.html
-#   Virer iBus (cf http://doc.ubuntu-fr.org/ibus)
+#   Fix accents with iBus (cf http://doc.ubuntu-fr.org/ibus) -> setxkbmap -layout fr -variant oss
 #
 # https://github.com/sgentle/caniuse-cmd
 #
 # sudo usermod -aG docker pierre ?
-# https://github.com/clvv/fasd
 # Dropbox
 # Vault for passwords and sensitive data: http://docs.ansible.com/ansible/playbooks_vault.html
 #