From ed56c96521bd133362994151f915c5aa07f880e0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 21 Apr 2020 14:56:41 +0200
Subject: Emacs: re-add company-lsp

Sometimes, TabNine's LSP integration doesn't work. It's nice to have a fallback.
---
 user/emacs/init.el      | 5 +++++
 user/settings/emacs.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/user/emacs/init.el b/user/emacs/init.el
index 4f8d8ec9..4d19b7e0 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -513,6 +513,11 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package all-the-icons
   :config (setq all-the-icons-color-icons nil))
 
+(use-package company-lsp
+  :config (progn
+            (setq company-lsp-enable-snippet nil)
+            (add-to-list 'company-backends #'company-lsp)))
+
 (use-package company-tabnine
   :commands (company-tabnine)
   :after (company)
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index da514c7f..1085e215 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -84,6 +84,7 @@ in
       bash-completion
       caddyfile-mode
       company
+      company-lsp
       company-web
       company-tabnine
       counsel
-- 
cgit 1.4.1