aboutsummaryrefslogtreecommitdiff
path: root/dot.emacs.d
diff options
context:
space:
mode:
authorThomas Schneider <qsx@chaotikum.eu>2019-12-23 21:07:59 +0100
committerThomas Schneider <qsx@chaotikum.eu>2019-12-23 21:07:59 +0100
commit59b263c2f84d207a87122bbc0505c03f70628cc4 (patch)
treef23980e8971a2bd4c17f93c38003d93f024fa814 /dot.emacs.d
parente5f504d1df429da65e1ae94d3259065fe2a04007 (diff)
Emacs: Add elpy
Diffstat (limited to 'dot.emacs.d')
-rw-r--r--dot.emacs.d/.gitignore1
-rw-r--r--dot.emacs.d/init.el11
2 files changed, 7 insertions, 5 deletions
diff --git a/dot.emacs.d/.gitignore b/dot.emacs.d/.gitignore
index c1d8c62..5c52875 100644
--- a/dot.emacs.d/.gitignore
+++ b/dot.emacs.d/.gitignore
@@ -12,3 +12,4 @@
/semanticdb/
/.lsp-session-v1
/abbrev_defs
+/elpy
diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el
index 5fad9ec..3fe64fa 100644
--- a/dot.emacs.d/init.el
+++ b/dot.emacs.d/init.el
@@ -82,11 +82,6 @@
(use-package company-reftex
:if (display-graphic-p)
:config (add-to-list 'company-backends 'company-reftex))
-(use-package company-jedi
- :config
- (add-hook 'python-mode-hook (defun qsx-python-mode-hook-jedi ()
- (make-local-variable company-backends)
- (add-to-list 'company-backends 'company-jedi))))
(use-package company-ansible
:config (add-to-list 'company-backends 'company-ansible))
(use-package company-shell
@@ -98,6 +93,12 @@
:bind (:map c-mode-map
("M-RET" . #'srefactor-refactor-at-point)))
+(use-package elpy
+ :ensure t
+ :defer t
+ :init
+ (advice-add 'python-mode :before 'elpy-enable))
+
(use-package lsp-mode
:commands lsp
:config (require 'lsp-clients))