home

commit bd8191143c84697ba92f3e6ad53087405e9bb3d0
parent 7101e4b7f8709f372bd8b7e277eeb3bf164c7ab5
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sat, 19 Mar 2022 11:19:43 +0100

tools/emacs: fix lsp with rnix

… and disable corfu in text-mode

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tools/emacs/config/config-completion.el
 | 
2
+-
M
tools/emacs/config/programming-nix.el
 | 
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/emacs/config/config-completion.el b/tools/emacs/config/config-completion.el
@@ -235,7 +235,7 @@ instead."
 
   ;; Recommended: Enable Corfu globally. This is recommended since dabbrev can
   ;; be used globally (M-/).
-  :hook (((prog-mode text-mode tex-mode) . corfu-mode)
+  :hook (((prog-mode tex-mode) . corfu-mode) ; text-mode
          ((shell-mode eshell-mode) . my/corfu-shell-settings))
   :bind (:map corfu-map
               ("TAB" . corfu-next)
diff --git a/tools/emacs/config/programming-nix.el b/tools/emacs/config/programming-nix.el
@@ -4,6 +4,7 @@
 ;;; Code:
 (use-package nix-mode
   :if *nix*
+  :after (lsp)
   :mode ("\\.nix\\'" "\\.nix.in\\'")
   :config
   (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))