diff --git a/dotfiles.yml b/dotfiles.yml
index 6b4a9ca..f5e907c 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -33,7 +33,7 @@
     - import_tasks: tasks/security.yml
 
     - import_tasks: tasks/python.yml
-    - import_tasks: tasks/vim.yml
+    - import_tasks: tasks/neovim.yml
     - import_tasks: tasks/intersect.yml
     - import_tasks: tasks/vscode.yml
     - import_tasks: tasks/gnome.yml
diff --git a/files/gvimrc b/files/gvimrc
deleted file mode 100644
index 73667cf..0000000
--- a/files/gvimrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include "vimrc" %}
-
-" Override the color scheme. gvim has a light background by default
-colo slate
diff --git a/files/i3.conf b/files/i3.conf
index 4fc4400..a6b32cb 100644
--- a/files/i3.conf
+++ b/files/i3.conf
@@ -50,7 +50,7 @@ bindsym $mod+Tab exec --no-startup-id rofi -show window
 bindsym $mod+c exec --no-startup-id rofi -show calc -modi calc -no-show-match -no-sort
 bindsym $mod+Return exec alacritty
 bindsym $mod+n exec --no-startup-id nautilus
-bindsym $mod+Shift+g exec --no-startup-id gvim
+bindsym $mod+Shift+g exec --no-startup-id nvim-qt
 bindsym Control+Shift+Escape exec --no-startup-id gnome-system-monitor
 bindsym Control+Q exec --no-startup-id /bin/false
 bindsym $mod+Shift+Delete exec --no-startup-id rofi-powermenu
diff --git a/files/vimrc b/files/vimrc
deleted file mode 100644
index c954284..0000000
--- a/files/vimrc
+++ /dev/null
@@ -1,21 +0,0 @@
-cmap w!! w !sudo tee >/dev/null %
-:set mouse=a
-
-syntax on
-filetype plugin indent on
-
-if !has('gui_running')
-  set t_Co=256
-endif
-
-set background=dark
-
-" Tab inserts 4 spaces
-set expandtab
-set ts=4 sw=4 sts=4
-
-" Autocomplete in command mode (Tab to invoke)
-set wildmenu
-
-" Set the 'default but not default' colour scheme
-colo default
diff --git a/files/zshrc/environment.sh b/files/zshrc/environment.sh
index 860883a..b3727d2 100644
--- a/files/zshrc/environment.sh
+++ b/files/zshrc/environment.sh
@@ -4,4 +4,4 @@ export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
 export HISTCONTROL=ignoreboth
 
 export BROWSER=$(which firefox)
-export EDITOR=$(which vim)
+export EDITOR=$(which nvim)
diff --git a/tasks/neovim.yml b/tasks/neovim.yml
new file mode 100644
index 0000000..886f9a0
--- /dev/null
+++ b/tasks/neovim.yml
@@ -0,0 +1,29 @@
+- name: Install neovim
+  aur:
+    name: "{{ item }}"
+  become: true
+  become_user: aur_builder
+  loop:
+    - neovim
+    - neovim-qt
+
+- name: Neovim config
+  git:
+    repo: https://git.theorangeone.net/sys/vim-config.git
+    dest: "{{ home }}/.config/nvim"
+    force: true
+  become: true
+  become_user: "{{ user }}"
+
+- name: Install config for root user
+  file:
+    src: "{{ home }}/.config/nvim"
+    dest: /root/.config/nvim
+    state: link
+
+# Aliases are too boring
+- name: Install vim alias
+  file:
+    src: /usr/bin/nvim
+    dest: /usr/bin/vim
+    state: link
diff --git a/tasks/vim.yml b/tasks/vim.yml
deleted file mode 100644
index 7be79b6..0000000
--- a/tasks/vim.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-- name: Install vim
-  aur:
-    name: "{{ item }}"
-  become: true
-  become_user: aur_builder
-  loop:
-    - gvim
-
-- name: Install vimrc
-  copy:
-    src: ./files/vimrc
-    dest: "{{ home }}/.vimrc"
-    mode: 0644
-    owner: "{{ user }}"
-    group: users
-
-- name: Install gvimrc
-  template:
-    src: ./files/gvimrc
-    dest: "{{ home }}/.gvimrc"
-    mode: 0644
-    owner: "{{ user }}"
-    group: users
-
-- name: Install vimrc for root user
-  copy:
-    src: ./files/vimrc
-    dest: /root/.vimrc
-    mode: 0644
-    owner: root
-    group: users