summaryrefslogtreecommitdiff
path: root/modules/common/emacs/doom
diff options
context:
space:
mode:
Diffstat (limited to 'modules/common/emacs/doom')
-rw-r--r--modules/common/emacs/doom/config.el6
-rw-r--r--modules/common/emacs/doom/init.el7
2 files changed, 4 insertions, 9 deletions
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index b6b39e5..e7e0bd4 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -85,9 +85,9 @@
(after! lsp-mode
(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
- :major-modes '(nix-mode)
- :server-id 'nix)))
+ (make-lsp-client :new-connection (lsp-stdio-connection '("nixd"))
+ :major-modes '(nix-mode)
+ :server-id 'nix)))
;;
;;; YAML
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index fbd7c4d..21b10c7 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -65,24 +65,20 @@
(magit +forge)
make
(pass +auth)
- ;; pdf
+ pdf
terraform
tree-sitter
upload
:os
(:if IS-MAC macos)
- ;; (tty +osc)
:lang
(cc +lsp +tree-sitter)
(common-lisp +lsp +tree-sitter)
- ;; (csharp +lsp +tree-sitter)
data
- ;; (dhall +lsp +tree-sitter)
(emacs-lisp +lsp +tree-sitter)
(go +lsp +tree-sitter)
- ;; graphql
(:if IS-LINUX (haskell +lsp +tree-sitter))
(java +lsp +tree-sitter)
(javascript +lsp +tree-sitter)
@@ -95,7 +91,6 @@
plantuml
(python +lsp +tree-sitter)
(:if IS-LINUX (racket +lsp +tree-sitter))
- ;; rst
(rust +lsp +tree-sitter)
(:if IS-LINUX (scheme +lsp +tree-sitter +racket))
(sh +lsp +tree-sitter)