diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el index a2f93456c..4da346a20 100644 --- a/modules/lang/python/config.el +++ b/modules/lang/python/config.el @@ -147,6 +147,17 @@ called.") (advice-add #'pipenv-deactivate :after-while #'+modeline|update-env-in-all-windows))) +(def-package! pyvenv + :after python + :config + (when (featurep! :ui modeline) + (add-hook 'pyvenv-post-activate-hooks #'+modeline|update-env-in-all-windows) + (add-hook 'pyvenv-post-deactivate-hooks #'+modeline|update-env-in-all-windows)) + (add-to-list 'global-mode-string + '(pyvenv-virtual-env-name (" venv:" pyvenv-virtual-env-name)) + 'append)) + + (def-package! pyenv-mode :when (featurep! +pyenv) :after python @@ -159,19 +170,6 @@ called.") (advice-add #'pyenv-mode-unset :after #'+modeline|update-env-in-all-windows))) -(def-package! pyvenv - :when (featurep! +pyvenv) - :after python - :config - (defun +python-current-pyvenv () pyvenv-virtual-env-name) - (when (featurep! :ui modeline) - (add-hook 'pyvenv-post-activate-hooks #'+modeline|update-env-in-all-windows) - (add-hook 'pyvenv-post-deactivate-hooks #'+modeline|update-env-in-all-windows)) - (add-to-list 'global-mode-string - '(pyvenv-virtual-env-name (" venv:" pyvenv-virtual-env-name)) - 'append)) - - (def-package! conda :when (featurep! +conda) :after python diff --git a/modules/lang/python/packages.el b/modules/lang/python/packages.el index f492a90d9..193f5d4bd 100644 --- a/modules/lang/python/packages.el +++ b/modules/lang/python/packages.el @@ -9,10 +9,9 @@ ;; Environmet management (package! pipenv) +(package! pyvenv) (when (featurep! +pyenv) (package! pyenv-mode)) -(when (featurep! +pyvenv) - (package! pyvenv)) (when (featurep! +conda) (package! conda))