diff --git a/.chezmoiignore b/.chezmoiignore
index cab7c70..13a2864 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -2,5 +2,4 @@
 /install-scripts/
 /old-scripts/
 /vim-fancy/
-/vim/
 /README.md
diff --git a/vim/.config/profile/env.d/vim.env b/dot_config/profile/env.d/vim.env.tmpl
similarity index 66%
rename from vim/.config/profile/env.d/vim.env
rename to dot_config/profile/env.d/vim.env.tmpl
index f2f1d82..29fb23f 100644
--- a/vim/.config/profile/env.d/vim.env
+++ b/dot_config/profile/env.d/vim.env.tmpl
@@ -1,3 +1,5 @@
+{{ if or (lookPath "vim") (lookPath "nvim") -}}
 # shellcheck disable=SC2016,SC2034
 VIMINIT='source $XDG_CONFIG_HOME/vim/vimrc'
 MYVIMRC='$XDG_CONFIG_HOME/vim/vimrc'
+{{- end }}
diff --git a/vim/.config/vim/autoload/plug.vim b/dot_config/vim/autoload/plug.vim.tmpl
similarity index 100%
rename from vim/.config/vim/autoload/plug.vim
rename to dot_config/vim/autoload/plug.vim.tmpl
diff --git a/vim/.config/vim/ftplugin/gitcommit.vim b/dot_config/vim/ftplugin/gitcommit.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/gitcommit.vim
rename to dot_config/vim/ftplugin/gitcommit.vim
diff --git a/vim/.config/vim/ftplugin/html.vim b/dot_config/vim/ftplugin/html.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/html.vim
rename to dot_config/vim/ftplugin/html.vim
diff --git a/vim/.config/vim/ftplugin/javascript.vim b/dot_config/vim/ftplugin/javascript.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/javascript.vim
rename to dot_config/vim/ftplugin/javascript.vim
diff --git a/vim/.config/vim/ftplugin/proto.vim b/dot_config/vim/ftplugin/proto.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/proto.vim
rename to dot_config/vim/ftplugin/proto.vim
diff --git a/vim/.config/vim/ftplugin/python.vim b/dot_config/vim/ftplugin/python.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/python.vim
rename to dot_config/vim/ftplugin/python.vim
diff --git a/vim/.config/vim/ftplugin/ruby.vim b/dot_config/vim/ftplugin/ruby.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/ruby.vim
rename to dot_config/vim/ftplugin/ruby.vim
diff --git a/vim/.config/vim/ftplugin/vim.vim b/dot_config/vim/ftplugin/vim.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/vim.vim
rename to dot_config/vim/ftplugin/vim.vim
diff --git a/vim/.config/vim/ftplugin/yaml.vim b/dot_config/vim/ftplugin/yaml.vim
similarity index 100%
rename from vim/.config/vim/ftplugin/yaml.vim
rename to dot_config/vim/ftplugin/yaml.vim
diff --git a/vim/.config/vim/init.d/mappings.vim b/dot_config/vim/init.d/mappings.vim.tmpl
similarity index 100%
rename from vim/.config/vim/init.d/mappings.vim
rename to dot_config/vim/init.d/mappings.vim.tmpl
diff --git a/vim/.config/vim/init.d/xdg.vim b/dot_config/vim/init.d/xdg.vim.tmpl
similarity index 100%
rename from vim/.config/vim/init.d/xdg.vim
rename to dot_config/vim/init.d/xdg.vim.tmpl
diff --git a/vim/.config/vim/plug.d/core.vim b/dot_config/vim/plug.d/core.vim
similarity index 100%
rename from vim/.config/vim/plug.d/core.vim
rename to dot_config/vim/plug.d/core.vim
diff --git a/vim/.config/vim/plug.d/nerdtree.vim b/dot_config/vim/plug.d/nerdtree.vim
similarity index 100%
rename from vim/.config/vim/plug.d/nerdtree.vim
rename to dot_config/vim/plug.d/nerdtree.vim
diff --git a/vim/.config/vim/plug.d/themes.vim b/dot_config/vim/plug.d/themes.vim
similarity index 100%
rename from vim/.config/vim/plug.d/themes.vim
rename to dot_config/vim/plug.d/themes.vim
diff --git a/vim/.config/vim/plugin/autogroup.vim b/dot_config/vim/plugin/autogroup.vim
similarity index 100%
rename from vim/.config/vim/plugin/autogroup.vim
rename to dot_config/vim/plugin/autogroup.vim
diff --git a/vim/.config/vim/plugin/commands.vim b/dot_config/vim/plugin/commands.vim
similarity index 100%
rename from vim/.config/vim/plugin/commands.vim
rename to dot_config/vim/plugin/commands.vim
diff --git a/vim/.config/vim/plugin/settings.vim b/dot_config/vim/plugin/settings.vim
similarity index 100%
rename from vim/.config/vim/plugin/settings.vim
rename to dot_config/vim/plugin/settings.vim
diff --git a/vim/.config/vim/plugin/theme.vim b/dot_config/vim/plugin/theme.vim
similarity index 100%
rename from vim/.config/vim/plugin/theme.vim
rename to dot_config/vim/plugin/theme.vim
diff --git a/vim/.config/vim/vimrc b/dot_config/vim/vimrc
similarity index 100%
rename from vim/.config/vim/vimrc
rename to dot_config/vim/vimrc