From 436ea4dc081076790a94ac0b4bb2d6b87ee51bb2 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Mon, 13 Mar 2023 10:19:40 +0100
Subject: [PATCH] Use eglot instead of lsp mode

---
 .emacs.d/init.el | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7cb7a53..b49cc0b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -110,6 +110,14 @@
   (mapc #'disable-theme custom-enabled-themes)
   (load-theme 'ef-winter :no-confirm))
 
+(use-package eglot
+  :hook
+  (swift-mode . eglot-ensure)
+  :config
+  (add-to-list
+   'eglot-server-programs
+   '(swift-mode . ("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/sourcekit-lsp"))))
+
 (use-package emacs
   :config
   (global-auto-revert-mode)
@@ -183,15 +191,6 @@
            :line-spacing 0.2)))
   (fontaine-set-preset 'regular))
 
-(use-package lsp-mode
-  :hook (swift-mode . lsp)
-  :commands lsp)
-
-(use-package lsp-sourcekit
-  :after lsp-mode
-  :config
-  (setq lsp-sourcekit-executable "/Library/Developer/CommandLineTools/usr/bin/sourcekit-lsp"))
-
 (use-package marginalia
   :init
   (marginalia-mode))