Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-03-02 15:35:04 -05:00
commit 6c7f053c4d
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -255,8 +255,7 @@
;(dap-tooltip-mode 1) ;(dap-tooltip-mode 1)
(eval-when-compile (eval-when-compile
(require 'cl-lib)) (require 'cl-lib))
(require 'dap-python) (require 'dap-python))
(require 'dap-lldb))
(use-package company (use-package company
:config :config
@ -305,28 +304,19 @@
(setq lsp-tex-server 'digestif) (setq lsp-tex-server 'digestif)
;; Python ;; Python
(use-package python-mode
:config (setq dap-python-debugger 'debugpy)
(require 'dap-python)
:custom
(dap-python-debugger 'debugpy))
(use-package lsp-pyright (use-package lsp-pyright
:hook (python-mode . (lambda () :hook (python-mode . (lambda ()
(require 'lsp-pyright) (require 'lsp-pyright)
(lsp)))) ; or lsp-deferred (lsp)))) ; or lsp-deferred
(use-package sphinx-doc
:hook (python-mode . sphinx-doc-mode)
:config
(setq sphinx-doc-include-types t))
(use-package numpydoc (use-package numpydoc
:bind (:map python-mode-map :bind (:map python-mode-map
("C-c C-n" . numpydoc-generate)) ("C-c C-n" . numpydoc-generate))
:config :config
(setq numpydoc-insert-examples-block nil)) (setq numpydoc-insert-examples-block nil))
;; Rust ;; Rust
;(use-package rust-mode) ;(use-package rust-mode)