From 81bdc806d609d084356c824f1659fa825a2fa5d2 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 29 Nov 2019 15:35:55 +0100
Subject: Emacs: Enable company-lsp

---
 user/emacs/.emacs.d/init.el | 6 +++++-
 user/settings/emacs.nix     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index 268682a1..42490ff6 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -472,6 +472,10 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 
 ;; (use-package all-the-icons)
 
+(use-package company-lsp
+  :config (progn
+            (add-to-list 'company-backends #'company-lsp)))
+
 (eval-when-compile (require 'subr-x))
 (eval-and-compile
   (defun company-tabnine-load-path ()
@@ -479,7 +483,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 
 (use-package company-tabnine
   :commands (company-tabnine)
-  :after (company)
+  :after (company-lsp)
   :load-path (lambda () (list (company-tabnine-load-path)))
   :custom ((company-tabnine-binaries-folder "~/.local/tabnine"))
   :general ("<M-tab>" #'company-tabnine-call-other-backends
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 4b3fed1a..d27377bd 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -47,6 +47,7 @@ in
       bash-completion
       caddyfile-mode
       company
+      company-lsp
       company-web
       company-tabnine
       counsel
-- 
cgit 1.4.1