diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/.emacs.d/init.el | 8 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el index 11dca233..9818194f 100644 --- a/user/emacs/.emacs.d/init.el +++ b/user/emacs/.emacs.d/init.el @@ -502,11 +502,6 @@ _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))) - (eval-when-compile (require 'subr-x)) (eval-and-compile (defun company-tabnine-load-path () @@ -860,11 +855,12 @@ _p_rev _u_pper _=_: upper/lower _r_esolve scss-mode-hook html-mode-hook haskell-mode-hook) - #'lsp) + #'lsp-deferred) :config (progn (require 'lsp-clients) (setq lsp-auto-guess-root t lsp-auto-configure nil + lsp-idle-delay 0.5 lsp-enable-symbol-highlighting nil) (add-to-list 'lsp-language-id-configuration '(js-mode . "javascript")))) diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index c3d1ca69..35b0da26 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -84,7 +84,6 @@ in bash-completion caddyfile-mode company - company-lsp company-web company-tabnine counsel |