diff --git a/tasks/arch_CLI_packages.yml b/tasks/arch_CLI_packages.yml
index 9f2b5cb..71e0c3a 100644
--- a/tasks/arch_CLI_packages.yml
+++ b/tasks/arch_CLI_packages.yml
@@ -55,6 +55,8 @@
       - profanity
       - neomutt
       - youtube-dl
+      - neovim
+      - python-pynvim
     state: present
   when: not minimal or not server
 
diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml
index fa5fb8e..f5c8f0e 100644
--- a/tasks/dotfiles.yml
+++ b/tasks/dotfiles.yml
@@ -81,6 +81,7 @@
   register: fishplugin
 
 # Vim config
+#
 - name: dotfiles -- Copy .vim/
   copy:
     src: files/dotfiles/vim/
@@ -88,14 +89,12 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
-  when: editor == 'vim'
 
 - name: dotfiles -- Creates .vim/autoload/
   file:
     path: /home/{{ item.username }}/.vim/autoload/
     state: directory
   with_items: "{{ me }}"
-  when: editor == 'vim'
 
 - name: dotfiles -- Download plug.vim
   get_url:
@@ -104,7 +103,6 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
-  when: editor == 'vim'
 
 - name: dotfiles -- Copy vimrc
   template:
@@ -113,8 +111,8 @@
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ me }}"
-  when: editor == 'vim'
 
+# Neovim config
 - name: dotfiles -- Copy nvim config
   copy:
     src: files/dotfiles/nvim
@@ -134,6 +132,7 @@
   when: editor == 'nvim'
 
 
+# Alacritty terminal
 - name: dotfiles -- Copy alacritty config
   copy:
     src: files/dotfiles/alacritty
diff --git a/vars/Choux.yml b/vars/Choux.yml
index 6ca3775..3dddb07 100644
--- a/vars/Choux.yml
+++ b/vars/Choux.yml
@@ -1,5 +1,6 @@
 ---
 prompt: fish
+editor: nvim
 
 deploy_public_key: id_ed25519_home.pub