aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dot.emacs.d/init.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el
index 3bfa0da..9f370ce 100644
--- a/dot.emacs.d/init.el
+++ b/dot.emacs.d/init.el
@@ -58,12 +58,10 @@
:bind (:map company-mode-map
([remap completion-at-point] . #'company-complete))
:config
- (global-company-mode)
(setq company-tooltip-align-annotations t
company-minimum-prefix-length 1))
(use-package company-math
:config
- (add-to-list 'company-backends 'company-math-symbols-unicode)
(add-hook 'TeX-mode-hook (defun qsx-TeX-mode-hook-company ()
(setq-local company-backends
(append '((company-math-symbols-latex company-latex-commands))
@@ -81,7 +79,6 @@
:config (add-to-list 'company-backends 'company-ansible))
(use-package company-shell
:config (add-to-list 'company-backends '(company-shell company-shell-env)))
-(use-package company-lsp)
(semantic-mode 1)
(use-package srefactor
@@ -95,11 +92,13 @@
(advice-add 'python-mode :before 'elpy-enable))
(use-package lsp-mode
- :commands lsp
- :config (require 'lsp-clients))
+ :commands lsp)
(use-package lsp-ui)
+(use-package company-lsp
+ :hook (company-mode . yas-minor-mode))
+
(use-package mercurial
:ensure nil
:bind-keymap ("C-c H" . hg-global-map))