diff --git a/README.md b/README.md
index dd6b200..38d074b 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@
 
 ## TODO
 
-- Git config (git config --global user.email "pim@kunis.nl", git config --global user.name "Pim Kunis", set vim as editor)
-- Install nextcloud
-- Install bashrc
-- Install latest neovim
-- Install i3 config
-- Install libreoffice
-- Install GIMP
-- Install Telegram
-- Install Signal
+- nextcloud
+- latest neovim
+- i3 config
+- libreoffice
+- GIMP
+- Telegram
+- Signal
+- asdf
+- Oh my zsh?
diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml
index 7111206..9b08abc 100644
--- a/roles/system/tasks/main.yml
+++ b/roles/system/tasks/main.yml
@@ -20,7 +20,11 @@
   user:
     name: "{{ ansible_user_id }}"
     shell: /usr/bin/zsh
-- name: Set git configuration
+- name: Install .gitconfig
   template:
     src: "{{ role_path }}/templates/.gitconfig.j2"
     dest: "/home/{{ ansible_user_id }}/.gitconfig"
+- name: Install .zshrc
+  template:
+    src: "{{ role_path }}/templates/.zshrc.j2"
+    dest: "/home/{{ ansible_user_id }}/.zshrc"
diff --git a/roles/system/templates/.zshrc.j2 b/roles/system/templates/.zshrc.j2
new file mode 100644
index 0000000..fb47062
--- /dev/null
+++ b/roles/system/templates/.zshrc.j2
@@ -0,0 +1,48 @@
+# Set up the prompt
+
+autoload -Uz promptinit
+promptinit
+prompt adam1
+
+setopt histignorealldups sharehistory
+
+# Use emacs keybindings even if our EDITOR is set to vi
+bindkey -e
+
+# Keep 1000 lines of history within the shell and save it to ~/.zsh_history:
+HISTSIZE=1000
+SAVEHIST=1000
+HISTFILE=~/.zsh_history
+
+# Use modern completion system
+autoload -Uz compinit
+compinit
+
+zstyle ':completion:*' auto-description 'specify: %d'
+zstyle ':completion:*' completer _expand _complete _correct _approximate
+zstyle ':completion:*' format 'Completing %d'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' menu select=2
+eval "$(dircolors -b)"
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
+zstyle ':completion:*' menu select=long
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' use-compctl false
+zstyle ':completion:*' verbose true
+
+zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
+zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
+
+# Custom stuff
+alias gp='git push'
+alias gco='git checkout'
+alias gd='git diff'
+alias gc='git commit'
+alias gpl='git pull'
+alias gs='git status'
+alias gb='git branch'
+alias ga='git add'
+alias gl='git log'