diff --git a/vars/Combava.yml b/vars/Combava.yml
index 01c8412..dc61227 100644
--- a/vars/Combava.yml
+++ b/vars/Combava.yml
@@ -1,5 +1,6 @@
 ---
 prompt: fish
+editor: nvim
 
 deploy_public_key: id_ed25519_home.pub
 
diff --git a/vars/common.yml b/vars/common.yml
index 0ed9b2d..5922420 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -13,7 +13,8 @@
 #     group: wheel
 #     groups: sudo, adm
 
-prompt: 'fish'
+prompt: fish
+editor: vim
 
 minimal: false
 server: false