diff --git a/bootstrap b/bootstrap
index 7c7aacc..912cd04 100644
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,6 @@
-check_bin "nvim nvim-gtk"
+required_commands "nvim nvim-gtk"
 process_dirs conf ${HOME}/.config
 
-define_env "EDITOR" "nvim"
+define_env "EDITOR" "nvim --no-fork"
 define_env "VISUAL" "nvim-gtk"
-# Neovim
 define_env "NVIM_GTK_NO_HEADERBAR" "1"