diff --git a/default.nix b/default.nix
index 5f113fa5..958d150a 100644
--- a/default.nix
+++ b/default.nix
@@ -302,6 +302,7 @@ let
     emacs4xo
     # pkgs.emacs-pgtk  # wayland with treesitter; alternatively pkgs.emacs30 for emacs+tree-sitter
     pkgs.tree-sitter # CLI tool, but not grammars
+    pkgs.llvmPackages_18.clang-tools  # clangd for lsp-mode
     pkgs.notmuch
     pkgs.emacsPackages.notmuch
     pkgs.inconsolata-lgc
diff --git a/xo-reader2/include/xo/reader2/SchematikaParser.hpp b/xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp
similarity index 100%
rename from xo-reader2/include/xo/reader2/SchematikaParser.hpp
rename to xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp
diff --git a/xo-reader2/src/reader2/SchematikaParser.cpp b/xo-reader2/src/reader2/DSchematikaParser.cpp
similarity index 100%
rename from xo-reader2/src/reader2/SchematikaParser.cpp
rename to xo-reader2/src/reader2/DSchematikaParser.cpp