diff --git a/.gitignore b/.gitignore
index c7ef1d83..fc856bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ config/fish/fish_variables
 config/gtk-3.0/bookmarks
 config/xfce4/xfconf/xfce-perchannel-xml
 config/i3/config.d
+config/nvim/.venv
diff --git a/Makefile b/Makefile
index 282e5ec9..7dc4ae95 100644
--- a/Makefile
+++ b/Makefile
@@ -32,12 +32,13 @@ unlink:
 	for link in $(THEMES_TARGETS); do rm "$$link"; done
 	rmdir $(HOME)/.ssh/sockets
 
-install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR)
+install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR) config/nvim/.venv
 
 uninstall:
 	rm -rf $(LAZY_DIR)
 	rm -rf $(PYENV_DIR)
 	rm -rf $(POETRY_DIR)
+	rm -rf config/nvim/.venv
 
 $(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
 $(SSH_TARGETS): $(SSH_DIR)/%: ssh/%
@@ -55,5 +56,11 @@ $(PYENV_DIR):
 $(POETRY_DIR):
 	python3 packages/poetry.py
 
+config/nvim/.venv:
+	python3 -m venv $@
+	$@/bin/python3 -m pip install -U pip wheel
+	$@/bin/python3 -m pip install --use-pep517 pynvim
+
+
 $(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets:
 	mkdir -p $@
diff --git a/config/fish/conf.d/pyenv.fish b/config/fish/conf.d/pyenv.fish
index a71ebfc1..8b7e6936 100644
--- a/config/fish/conf.d/pyenv.fish
+++ b/config/fish/conf.d/pyenv.fish
@@ -1,5 +1,4 @@
 if status is-interactive
     set -gx PYENV_ROOT $HOME/.pyenv
     set -g fish_user_paths $PYENV_ROOT/bin $fish_user_paths
-    pyenv init - | source
 end
diff --git a/config/nvim/.envrc b/config/nvim/.envrc
new file mode 100644
index 00000000..86241311
--- /dev/null
+++ b/config/nvim/.envrc
@@ -0,0 +1 @@
+source .venv/bin/activate
diff --git a/config/nvim/lua/config/init.lua b/config/nvim/lua/config/init.lua
index 45617604..8d7a559d 100644
--- a/config/nvim/lua/config/init.lua
+++ b/config/nvim/lua/config/init.lua
@@ -1,6 +1,6 @@
 vim.opt.title = true
 vim.opt.cmdheight = 0
-vim.g.python3_host_prog = "/usr/bin/python3"
+vim.g.python3_host_prog = vim.fn.stdpath "config" .. "/.venv/bin/python"
 vim.g.python_indent = {
     open_paren = "shiftwidth()",
     nested_paren = "shiftwidth()",