From cdb1df511e6216a32779708de1b8271fab39c2f4 Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Sun, 25 Sep 2022 12:08:22 -0400
Subject: [PATCH] Remove eglot

I'm now using exclusively lsp-mode
---
 lisp/dev.el                  | 3 ---
 lisp/scala.el                | 4 ----
 lisp/web.el                  | 6 +-----
 straight/versions/default.el | 4 ----
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/lisp/dev.el b/lisp/dev.el
index 114dac2..85e8a47 100644
--- a/lisp/dev.el
+++ b/lisp/dev.el
@@ -51,9 +51,6 @@
   :config
   (projectile-mode))
 
-(use-package eglot
-  :defer t)
-
 (use-package lsp-mode
   :defer t
   :custom
diff --git a/lisp/scala.el b/lisp/scala.el
index 682b975..3daa190 100644
--- a/lisp/scala.el
+++ b/lisp/scala.el
@@ -10,7 +10,3 @@
    'minibuffer-complete-word
    'self-insert-command
    minibuffer-local-completion-map))
-
-(with-eval-after-load 'eglot
-  (add-to-list 'eglot-server-programs
-               '(scala-mode . ("metals-emacs"))))
diff --git a/lisp/web.el b/lisp/web.el
index 2448aa7..7674760 100644
--- a/lisp/web.el
+++ b/lisp/web.el
@@ -19,8 +19,4 @@
   (web-mode-content-types-alist '(("jsx"  . ".*\\.js[x]?\\'")))
   (web-mode-markup-indent-offset 2)
   (web-mode-code-indent-offset 2)
-  (web-mode-engines-alist '(("django" . "\\.html?\\'")))
-  :init
-  (with-eval-after-load 'eglot
-    (add-to-list 'eglot-server-programs
-                 '(web-mode . ("javascript-typescript-stdio")))))
+  (web-mode-engines-alist '(("django" . "\\.html?\\'"))))
diff --git a/straight/versions/default.el b/straight/versions/default.el
index a59369b..930732b 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -24,9 +24,7 @@
  ("dockerfile-mode" . "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
  ("ebuild-mode" . "4e191a5084c251c7e00339ed7c318bb20bf34987")
  ("editorconfig-emacs" . "1f6f16c24fd0030322d59c2853067a6dccc9e736")
- ("eglot" . "83052a5e61267a2e1c091c1bd4301ea81f1bc6d7")
  ("el-get" . "9a4ab9cc8ae4a9b9a4b232788039cc679a4ba249")
- ("eldoc" . "1835c4f2ab0140a9a40fc584757d2a9ca644a20c")
  ("elisp-slime-nav" . "8588d80d414aee1fafce5b9da0e913612ee0bcdd")
  ("emacs-ccls" . "ae74a39303457a5e6976dd1c6816cde97d357a0d")
  ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5")
@@ -50,7 +48,6 @@
  ("exec-path-from-shell" . "ddd24dc823de9a94435b4d8ea7569161657f31e2")
  ("f.el" . "d50dca48929575642912bb5bbb2585709ba38f82")
  ("flycheck" . "b8f5bad487dafb942b577b571786e4495bd5a400")
- ("flymake" . "6d6880639d6a6fe56e358d89c0bd1c8c827a138f")
  ("forge" . "2a2c6dde1754679673ccb29eb384dabe1d43624c")
  ("fzf.el" . "21912ebc7e1084aa88c9d8b7715e782a3978ed23")
  ("ghub" . "f07790b36beb563d5b87be896efbd3b8533f2acf")
@@ -64,7 +61,6 @@
  ("help-plus" . "405d525cffd25fd3f3c7976b4fdb0d0a3bccb64c")
  ("ht.el" . "cdc76669a5032c42a2b9f7cddcbc33c5deeb6beb")
  ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
- ("jsonrpc" . "2c74dc5afd4520da9e11d9a570146e6d50e86d2c")
  ("kotlin-mode" . "99499e1500034b5fd5fdce9bfef367d90c61b5ce")
  ("kubel" . "4bd0c627f198cd2ec72e4f74f7d89778f514443f")
  ("let-alist" . "592553db5929b54db40af0df90c5add0aaca045b")
-- 
2.38.4