Add pydoc.

elisp/extras.el

@@ -5,9 +5,13 @@
 ;; Always use slant for italic, not underline
 '(italic ((t (:slant italic))))
 
+;; Save point
+(save-place-mode 1)
+
 ;;;; Load my packages
 ;; Default theme
 (use-package zenburn-theme
+  :demand t
   :config
   (load-theme 'zenburn t))
 
@@ -36,6 +40,7 @@
 ;; then use doom-modeline
 (use-package all-the-icons)
 (use-package doom-modeline
+  :straight t
   :config
   (progn
     (setq doom-modeline-buffer-encoding nil)
@@ -47,6 +52,7 @@
   (after-init . doom-modeline-mode))
 
 (use-package dashboard
+  :demand t
   :config
   (dashboard-setup-startup-hook))
 
@@ -62,9 +68,7 @@
    (setq pdf-view-midnight-colors '("#DCDCCC" . "#3F3F3F"))))
 
 (use-package saveplace-pdf-view
-  :straight t
-  :config
-  (save-place-mode 1))
+  :straight t)
 
 ;; Mail reader
 (use-package mu4e
@@ -115,20 +119,48 @@
     (setq dash-docs-browser-func 'eww)
     (setq dash-docs-enable-debugging nil)))
 
+;; TODO I'm only using demand so <f3> is set from the start
 (use-package treemacs
+  :demand t
   :config
   (global-set-key (kbd "<f3>") 'treemacs))
 
 ;; language server
-(use-package lsp-mode)
-(use-package lsp-ui)
-(use-package lsp-treemacs)
-(use-package lsp-ivy)
-(use-package company-lsp)
-(use-package yasnippet
+;; (use-package lsp-mode)
+;; (use-package lsp-ui)
+;; (use-package lsp-treemacs)
+;; (use-package lsp-ivy)
+;; (use-package company-lsp)
+;; (use-package yasnippet
+;;   :config
+;;   (yas-global-mode 1))
+;; (use-package dap-mode)
+
+(use-package eglot
+  :ensure t
+  :defer t
+  :hook (python-mode . eglot-ensure)
   :config
-  (yas-global-mode 1))
-(use-package dap-mode)
+  (setq-default eglot-workspace-configuration
+                '((:pylsp . (:configurationSources ["flake8"]
+                             :plugins (
+                                       :pycodestyle (:enabled :json-false)
+                                       :mccabe (:enabled :json-false)
+                                       :pyflakes (:enabled :json-false)
+                                       :flake8 (:enabled t
+                                                :maxLineLength 88)
+                                       :pydocstyle (:enabled t
+                                                    :convention "numpy")
+                                       :yapf (:enabled :json-false)
+                                       :autopep8 (:enabled :json-false)
+                                       :black (:enabled t
+                                               :line_length 88
+                                               :cache_config t)))))
+                ))
+
+;; (add-hook (quote python-mode-hook)
+;;           (function
+;;            eglot-ensure))
 
 ;; R
 ;(use-package ess
@@ -204,6 +236,9 @@
   :after python
   :hook (python-mode . python-black-on-save-mode-enable-dwim))
 
+(use-package pydoc
+  :straight t)
+
 ;; Ivy related stuff
 (use-package ivy)
 (use-package ivy-bibtex

init.el

@@ -20,6 +20,8 @@
   (require 'use-package))
 ;(setq straight-use-package-by-default t)
 
+(setq use-package-always-defer t)
+
 ;; Minimal package.el use so we can explore melpa packages
 (require 'package)
 (add-to-list 'package-archives