summaryrefslogtreecommitdiff
path: root/modules/common/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'modules/common/emacs')
-rw-r--r--modules/common/emacs/default.nix2
-rw-r--r--modules/common/emacs/doom/config.el11
2 files changed, 1 insertions, 12 deletions
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index ed25536..1d205b9 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -92,7 +92,7 @@ in {
jre # :lang plantuml
libtool # :term vterm
libxml2 # :lang data
- nixd # :lang (nix +lsp)
+ nil # :lang (nix +lsp)
nodePackages.bash-language-server # :lang (sh +lsp)
nodePackages.eslint # :lang (json +lsp)
nodePackages.js-beautify # :lang web
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index e7e0bd4..015954b 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -79,17 +79,6 @@
(setq lsp-haskell-formatting-provider "ormolu")
;;
-;;; Nix
-;;
-
-(after! lsp-mode
- (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
- (lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection '("nixd"))
- :major-modes '(nix-mode)
- :server-id 'nix)))
-
-;;
;;; YAML
;;