diff --git a/playbooks/roles/ubuntu/tasks/main.yml b/playbooks/roles/ubuntu/tasks/main.yml
index ea2a4ac..fa25174 100644
--- a/playbooks/roles/ubuntu/tasks/main.yml
+++ b/playbooks/roles/ubuntu/tasks/main.yml
@@ -12,14 +12,16 @@
   apt:
     force_apt_get: yes
     name: 
-      - neovim
       - git
       - zsh
       - tmux
       - gpg
       - software-properties-common
+      - rsync
     state: latest
 
+- include_tasks: neovim-nightly.yml
+
 - name: Install Development Tools
   become: yes
   become_method: sudo
@@ -32,17 +34,3 @@
       - pkg-config
       - libclang1
     state: latest
-
-# - name: Add hstr repo
-#   become: yes
-#   become_method: sudo
-#   command: "add-apt-repository ppa:acicchetti/utils"
-
-# - name: Install hstr
-#   become: yes
-#   become_method: sudo
-#   apt: 
-#     force_apt_get: yes
-#     name: hstr
-#     state: latest
-#     update_cache: yes
diff --git a/playbooks/roles/ubuntu/tasks/neovim-nightly.yml b/playbooks/roles/ubuntu/tasks/neovim-nightly.yml
new file mode 100644
index 0000000..d0a4c77
--- /dev/null
+++ b/playbooks/roles/ubuntu/tasks/neovim-nightly.yml
@@ -0,0 +1,16 @@
+---
+- name: Add neovim unstable ppa
+  become: yes
+  become_method: sudo
+  when:
+    - nightly_neovim == true
+  apt_repository:
+    repo: ppa:neovim-ppa/unstable
+
+- name: Install neovim
+  become: yes
+  become_method: sudo
+  apt: 
+    name: neovim
+    update_cache: yes
+