diff --git a/Ansible/roles/eryn/tasks/main.yml b/Ansible/roles/eryn/tasks/main.yml
index fedd6b6..fe04720 100644
--- a/Ansible/roles/eryn/tasks/main.yml
+++ b/Ansible/roles/eryn/tasks/main.yml
@@ -1,3 +1,8 @@
 ---
 - name: Configure ZSH
   import_tasks: zsh.yml
+
+- name: Configure vim
+  import_tasks: vim.yml
+- name: Configure neovim
+  import_tasks: neovim.yml
diff --git a/Ansible/roles/eryn/tasks/neovim.yml b/Ansible/roles/eryn/tasks/neovim.yml
new file mode 100644
index 0000000..e259a76
--- /dev/null
+++ b/Ansible/roles/eryn/tasks/neovim.yml
@@ -0,0 +1,10 @@
+---
+- name: "neovim : Install neovim"
+  ansible.builtin.package:
+    name: neovim
+    state: present
+
+- name: "neovim : Symlink config"
+  ansible.builtin.include_tasks: symlink_dotfile_directory.yml
+  vars:
+    dotfile_src: config/nvim
diff --git a/Ansible/roles/eryn/tasks/vim.yml b/Ansible/roles/eryn/tasks/vim.yml
new file mode 100644
index 0000000..02f0c3e
--- /dev/null
+++ b/Ansible/roles/eryn/tasks/vim.yml
@@ -0,0 +1,23 @@
+---
+- name: "vim : Symlink config files"
+  ansible.builtin.include_tasks: symlink_dotfile.yml
+  vars:
+    dotfile_src: "{{ item }}"
+  loop:
+    - vimrc
+    - vimrc.common
+
+# The viminfo file goes here, but vim won't write it if the directory doesn't exist.
+- name: "vim : Create vim state directory"
+  ansible.builtin.file:
+    path: "{{ ansible_local.xdg.state_home }}/vim"
+    owner: "{{ ansible_user_id }}"
+    mode: 0750
+    state: directory
+
+- name: "vim : Symlink runtime directory"
+  ansible.builtin.include_tasks: symlink_dotfile_directory.yml
+  vars:
+    dotfile_src: "{{ item }}"
+  loop:
+    - vim