Use eglot instead of lsp-mode
This commit is contained in:
parent
d1171a6a8f
commit
97824d4a21
2 changed files with 23 additions and 40 deletions
|
|
@ -125,6 +125,15 @@
|
||||||
(use-package dockerfile-mode
|
(use-package dockerfile-mode
|
||||||
:defer t)
|
:defer t)
|
||||||
|
|
||||||
|
(use-package ediff
|
||||||
|
:config
|
||||||
|
(setq
|
||||||
|
ediff-keep-variants nil
|
||||||
|
ediff-make-buffers-readonly-at-startup nil
|
||||||
|
ediff-show-clashes-only t
|
||||||
|
ediff-split-window-function 'split-window-horizontally
|
||||||
|
ediff-window-setup-function 'ediff-setup-windows-plain))
|
||||||
|
|
||||||
(use-package ef-themes
|
(use-package ef-themes
|
||||||
:config
|
:config
|
||||||
(setq ef-themes-headings
|
(setq ef-themes-headings
|
||||||
|
|
@ -136,14 +145,20 @@
|
||||||
ef-themes-variable-pitch-ui t)
|
ef-themes-variable-pitch-ui t)
|
||||||
(mapc #'disable-theme custom-enabled-themes))
|
(mapc #'disable-theme custom-enabled-themes))
|
||||||
|
|
||||||
(use-package ediff
|
(use-package eglot
|
||||||
|
:ensure t
|
||||||
|
:hook ((typescript-mode . eglot-ensure)
|
||||||
|
(tsx-ts-mode . eglot-ensure)
|
||||||
|
(js-mode . eglot-ensure)
|
||||||
|
(js-ts-mode . eglot-ensure)
|
||||||
|
(typescript-ts-mode . eglot-ensure)
|
||||||
|
(react-native-mode . eglot-ensure))
|
||||||
:config
|
:config
|
||||||
(setq
|
(setq eglot-events-buffer-size 0
|
||||||
ediff-keep-variants nil
|
eglot-sync-connect nil)
|
||||||
ediff-make-buffers-readonly-at-startup nil
|
(add-to-list 'eglot-server-programs
|
||||||
ediff-show-clashes-only t
|
'((typescript-ts-mode tsx-ts-mode js-mode js-ts-mode)
|
||||||
ediff-split-window-function 'split-window-horizontally
|
. ("typescript-language-server" "--stdio"))))
|
||||||
ediff-window-setup-function 'ediff-setup-windows-plain))
|
|
||||||
|
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
@ -356,37 +371,6 @@
|
||||||
(to/set-ligatures-for-font (face-attribute 'default :family))
|
(to/set-ligatures-for-font (face-attribute 'default :family))
|
||||||
(global-ligature-mode t))
|
(global-ligature-mode t))
|
||||||
|
|
||||||
(use-package lsp-mode
|
|
||||||
:bind (:map lsp-mode-map
|
|
||||||
("M-." . lsp-find-definition))
|
|
||||||
:hook
|
|
||||||
((lsp-mode . lsp-diagnostics-mode)
|
|
||||||
((js-mode
|
|
||||||
js-ts-mode
|
|
||||||
js-jsx-mode
|
|
||||||
typescript-ts-mode
|
|
||||||
tsx-ts-mode) . lsp-deferred)
|
|
||||||
((python-mode python-ts-mode) . lsp-deferred)
|
|
||||||
(nix-mode . lsp-deferred)
|
|
||||||
((swift-mode swift-ts-mode) . lsp-deferred))
|
|
||||||
:commands lsp
|
|
||||||
:custom
|
|
||||||
(lsp-keep-workspace-alive nil)
|
|
||||||
(lsp-keymap-prefix "C-c l")
|
|
||||||
(lsp-enable-on-type-formatting nil)
|
|
||||||
(lsp-enable-indentation nil)
|
|
||||||
:config
|
|
||||||
(setq lsp-inline-completion-enable t)
|
|
||||||
|
|
||||||
(add-to-list 'lsp-language-id-configuration '(swift-ts-mode . "swift"))
|
|
||||||
(let ((lsp-sourcekit-executable (string-trim
|
|
||||||
(shell-command-to-string "xcrun --find sourckit-lsp"))))
|
|
||||||
(lsp-register-client
|
|
||||||
(make-lsp-client :new-connection (lsp-stdio-connection
|
|
||||||
(lambda () lsp-sourcekit-executable))
|
|
||||||
:major-modes '(swift-mode swift-ts-mode)
|
|
||||||
:server-id 'sourcekit-ls))))
|
|
||||||
|
|
||||||
(use-package magit
|
(use-package magit
|
||||||
:defer t)
|
:defer t)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@
|
||||||
diff-hl
|
diff-hl
|
||||||
dockerfile-mode
|
dockerfile-mode
|
||||||
ef-themes
|
ef-themes
|
||||||
|
eglot
|
||||||
envrc
|
envrc
|
||||||
exec-path-from-shell
|
exec-path-from-shell
|
||||||
flycheck
|
flycheck
|
||||||
|
|
@ -129,8 +130,6 @@
|
||||||
js2-mode
|
js2-mode
|
||||||
json-mode
|
json-mode
|
||||||
ligature
|
ligature
|
||||||
lsp-mode
|
|
||||||
lsp-ui
|
|
||||||
minions
|
minions
|
||||||
multiple-cursors
|
multiple-cursors
|
||||||
nerd-icons
|
nerd-icons
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue