diff options
Diffstat (limited to '')
-rw-r--r-- | modules/common/emacs/default.nix | 16 | ||||
-rw-r--r-- | modules/common/emacs/doom/config.el | 6 | ||||
-rw-r--r-- | modules/common/emacs/doom/init.el | 7 |
3 files changed, 11 insertions, 18 deletions
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index 9589e65..ed25536 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -71,31 +71,29 @@ in { python-lsp-server # :lang (python +lsp) ])) asmfmt # :editor format - bash-language-server # :lang (sh +lsp) clang-tools # :lang (cc +lsp) :editor format cmake # :term vterm cmake-format # :lang cc :editor format cmigemo # :lang japanese - css-language-server # :lang (web +lsp) - dockerfile-language-server # :tools (docker +lsp) - editorconfig # :tools editorconfig + dockerfile-language-server-nodejs # :tools (docker +lsp) + dockfmt # :tools docker + editorconfig-core-c # :tools editorconfig fd # doom! gcc # :tools magit :term vterm gnumake # :term vterm gnuplot # :lang (org +gnuplot) gnutls # doom! - go-language-server # :lang (go +lsp) gomodifytags # :lang go + gopls # :lang (go +lsp) gore # :lang go - gotests # :lang go gotools # :lang go graphviz # :lang (org +roam2) :lang plantuml - html-language-server # :lang (web +lsp) html-tidy # :lang web jre # :lang plantuml - json-language-server # :lang (json +lsp) libtool # :term vterm - nix-language-server # :lang (nix +lsp) + libxml2 # :lang data + nixd # :lang (nix +lsp) + nodePackages.bash-language-server # :lang (sh +lsp) nodePackages.eslint # :lang (json +lsp) nodePackages.js-beautify # :lang web nodePackages.prettier # :editor format 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) |