diff --git a/neovim/init.vim b/neovim/init.vim
index 4b7263b..a69e7d8 100644
--- a/neovim/init.vim
+++ b/neovim/init.vim
@@ -11,7 +11,6 @@ if dein#load_state('~/.config/nvim/plugins')
   call dein#add('Shougo/denite.nvim')
   call dein#add('Shougo/deoplete.nvim')
   call dein#add('fatih/vim-go')
-  call dein#add('vim-python/python-syntax')
   call dein#add('jiangmiao/auto-pairs')
   call dein#add('neomake/neomake')
   call dein#add('ntpeters/vim-better-whitespace')
@@ -19,6 +18,7 @@ if dein#load_state('~/.config/nvim/plugins')
   call dein#add('scrooloose/nerdtree')
   call dein#add('tpope/vim-repeat')
   call dein#add('tpope/vim-surround')
+  call dein#add('vim-python/python-syntax')
   call dein#add('zchee/deoplete-go')
 
   call dein#end()
diff --git a/tako/config.tako b/tako/config.tako
index d291a68..ac91947 100644
--- a/tako/config.tako
+++ b/tako/config.tako
@@ -18,7 +18,7 @@ source_many($HOME + '/.config/tako/completers', is_tako)
 $TAKO_SETTINGS.auto_pushd = True
 
 $XDG_CONFIG_HOME = $HOME + '/.config'
-$EDITOR = 'emacs'
+$EDITOR = 'nvim'
 $VISUAL = $EDITOR
 
 for path in [
diff --git a/zsh/.zshenv b/zsh/.zshenv
index f611454..2feafce 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,6 +1,6 @@
 export PATH=$HOME/bin:$HOME/.local/bin:$PATH
 
-export EDITOR='emacs'
+export EDITOR='nvim'
 export VISUAL=$EDITOR
 
 if [[ -a /usr/bin/virtualenvwrapper.sh ]]; then