diff --git a/README.md b/README.md
index f242fc2..442767f 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,9 @@
 - Cool neovim setup
 - strawberry
 - fuzzy find
-- autostart syncthing
 - keepass config
+- thunderbird config
+- some kind of tag setup with: bootstrap, update etc
 
 Would like Ansible Vault to check in keypair for syncthing.
 However, then I would need a password to unlock the vault.
diff --git a/playbooks/all.yml b/playbooks/all.yml
index 60d6df4..06a7de0 100644
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -8,3 +8,4 @@
     - signal
     - virtualbox
     - vscodium
+    - syncthing
diff --git a/roles/neovim/tasks/main.yml b/roles/neovim/tasks/main.yml
index 2517f2a..29df9fd 100644
--- a/roles/neovim/tasks/main.yml
+++ b/roles/neovim/tasks/main.yml
@@ -1,38 +1,10 @@
-- name: Install prerequisite APT packages
-  # https://github.com/neovim/neovim/wiki/Building-Neovim#build-prerequisites
+- name: Install Neovim PPA
+  become: true
+  apt_repository:
+    repo: ppa:neovim-ppa/unstable
+    state: present
+- name: Install Neovim
   become: true
   apt:
-    state: latest
-    update_cache: yes
-    cache_valid_time: 86400 # One day
-    pkg:
-      - ninja-build
-      - gettext
-      - libtool
-      - libtool-bin
-      - autoconf
-      - automake
-      - cmake
-      - g++
-      - pkg-config
-      - unzip
-      - curl
-      - doxygen
-- name: Pull neovim repository
-  become: true
-  git:
-    repo: https://github.com/neovim/neovim.git
-    dest: ~/neovim
-- name: Build neovim
-  become: true
-  make:
-    chdir: ~/neovim
-    params:
-      CMAKE_BUILD_TYPE: RelWithDebInfo
-  changed_when: false # I lie a bit, but neovim makefile doesn't cooperate
-- name: Install neovim
-  become: true
-  make:
-    chdir: ~/neovim
-    target: install
-  changed_when: false # Idem
+    name: neovim
+    state: present
diff --git a/roles/system/templates/.gitconfig.j2 b/roles/system/templates/.gitconfig.j2
index 4bbc1f6..33db381 100644
--- a/roles/system/templates/.gitconfig.j2
+++ b/roles/system/templates/.gitconfig.j2
@@ -2,4 +2,4 @@
 	email = {{ email }}
 	name = {{ full_name }}
 [core]
-	editor = /usr/local/bin/nvim
+	editor = /usr/bin/nvim
diff --git a/roles/zsh/templates/.zshrc.j2 b/roles/zsh/files/.zshrc
similarity index 95%
rename from roles/zsh/templates/.zshrc.j2
rename to roles/zsh/files/.zshrc
index 7aa8b26..8bca8d8 100644
--- a/roles/zsh/templates/.zshrc.j2
+++ b/roles/zsh/files/.zshrc
@@ -49,8 +49,6 @@ alias gl='git log'
 
 # asdf
 . $HOME/.asdf/asdf.sh
-fpath=(${ASDF_DIR}/completions $fpath)
-autoload -Uz compinit && compinit
 
 # For neovim
 PATH=$PATH:/usr/local
diff --git a/roles/zsh/tasks/main.yml b/roles/zsh/tasks/main.yml
index d32e461..c575e87 100644
--- a/roles/zsh/tasks/main.yml
+++ b/roles/zsh/tasks/main.yml
@@ -12,6 +12,6 @@
     name: "{{ ansible_user_id }}"
     shell: /usr/bin/zsh
 - name: Install .zshrc
-  template:
-    src: "{{ role_path }}/templates/.zshrc.j2"
+  copy:
+    src: "{{ role_path }}/files/.zshrc"
     dest: ~/.zshrc