diff --git a/.dir-locals.el b/.dir-locals.el
index 2d2d00a..6adb6ce 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,10 +1,9 @@
 ;;; Directory Local Variables            -*- no-byte-compile: t -*-
 ;;; For more information see (info "(emacs) Directory Variables")
 
-((nil    . ((projectile-project-compilation-cmd . "make")
-            (projectile-project-configure-cmd   . "make clean")
-            (+license/license-choice            . "GPLv2")))
- (c++-mode . ((flycheck-gcc-include-path          . (".." "../avm"))
-              (flycheck-clang-include-path        . (".." "../avm"))
-              (company-clang-arguments            . ("-I.." "-I../avm"))
-              (eval                               . (clang-format-mode t)))))
+((nil      . ((+license/license-choice     . "GPLv2")))
+ (c++-mode . ((flycheck-gcc-include-path   . (".." "../avm"))
+              (flycheck-clang-include-path . (".." "../avm"))
+              (company-clang-arguments     . ("-I.." "-I../avm"))
+              (mode                        . clang-format)
+              (eval                        . (eglot-ensure)))))
diff --git a/avm b/avm
index c833f49..95a8747 160000
--- a/avm
+++ b/avm
@@ -1 +1 @@
-Subproject commit c833f4946b5344e6b95c4dc8d7e98b551dd4dc5a
+Subproject commit 95a8747c7f3e7387666ae69f48ccddf651cc46f6