summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2020-04-21 14:56:41 +0200
committerAlan Pearce2020-04-21 14:56:41 +0200
commited56c96521bd133362994151f915c5aa07f880e0 (patch)
tree7aca405b69a185e927fb2e0b2a8d2fd70758ef05 /user
parentb6c4ba49fa602242534288210351c9e582684b99 (diff)
downloadnixfiles-ed56c96521bd133362994151f915c5aa07f880e0.tar.lz
nixfiles-ed56c96521bd133362994151f915c5aa07f880e0.tar.zst
nixfiles-ed56c96521bd133362994151f915c5aa07f880e0.zip
Emacs: re-add company-lsp
Sometimes, TabNine's LSP integration doesn't work. It's nice to have a fallback.
Diffstat (limited to 'user')
-rw-r--r--user/emacs/init.el5
-rw-r--r--user/settings/emacs.nix1
2 files changed, 6 insertions, 0 deletions
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