diff --git a/lisp/prog-common.el b/lisp/prog-common.el index 614090e2bbba63967a4b4733237cfc66a8053b4c..e6ec3b9984952f9d91edc057343d288700576579 100644 --- a/lisp/prog-common.el +++ b/lisp/prog-common.el @@ -32,11 +32,7 @@ "=r" #'lsp-format-region "=o" #'lsp-organize-imports ;; code - "cr" #'lsp-rename - ;; backends - "bd" #'lsp-describe-session - "br" #'lsp-workspace-restart - "bx" #'lsp-workspace-shutdown) + "cr" #'lsp-rename) :commands (lsp lsp-deferred)) (use-package lsp-ui diff --git a/lisp/prog-python.el b/lisp/prog-python.el index 01bab5eff7c58b09de7b55d60af418bdf069db5e..c26946391c00608a6bd43005e60826e4802df338 100644 --- a/lisp/prog-python.el +++ b/lisp/prog-python.el @@ -12,7 +12,7 @@ (let ((file-path (expand-file-name ".venv" root-path))) (cond ((file-directory-p file-path) (pyvenv-activate file-path) - (setq pyvenv-activate file-path) + ;; (setq pyvenv-activate file-path) (message "Activated local virtualenv")) (t (message ".venv is not a directory"))))))) @@ -27,10 +27,10 @@ (use-package lsp-pyright :ensure t - :hook (python-mode . (lambda () (require 'lsp-pyright))) -;; :init (when (executable-find "python3") -;; (setq lsp-pyright-python-executable-cmd "python3"))) - ) + :init (when (and *sys/linux* (executable-find "python3") + (setq lsp-pyright-python-executable-cmd "python3"))) + + :hook (python-mode . (lambda () (require 'lsp-pyright)))) (use-package yapfify :ensure t