4 files changed, 21 insertions, 13 deletions
diff --git a/lua/mason-registry/cmake-format/init.lua b/lua/mason-registry/cmake-format/init.lua
deleted file mode 100644
index 2750c8ff..00000000
--- a/lua/mason-registry/cmake-format/init.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local Pkg = require "mason-core.package"
-local pip3 = require "mason-core.managers.pip3"
-
-return Pkg.new {
-    name = "cmake-format",
-    desc = [[Source code formatter for cmake listfiles]],
-    homepage = "https://pypi.org/project/cmakelang/",
-    languages = { Pkg.Lang.CMake },
-    categories = { Pkg.Cat.Formatter },
-    install = pip3.packages { "cmakelang", bin = { "cmake-format" } },
-}
diff --git a/lua/mason-registry/cmakelang/init.lua b/lua/mason-registry/cmakelang/init.lua
new file mode 100644
index 00000000..9ecaffbf
--- /dev/null
+++ b/lua/mason-registry/cmakelang/init.lua
@@ -0,0 +1,19 @@
+local Pkg = require "mason-core.package"
+local pip3 = require "mason-core.managers.pip3"
+
+return Pkg.new {
+    name = "cmakelang",
+    desc = [[Language tools for cmake (format, lint, etc)]],
+    homepage = "https://pypi.org/project/cmakelang/",
+    languages = { Pkg.Lang.CMake },
+    categories = { Pkg.Cat.Formatter, Pkg.Cat.Linter },
+    install = pip3.packages {
+        "cmakelang",
+        bin = {
+            "cmake-annotate",
+            "cmake-format",
+            "cmake-lint",
+            "ctest-to",
+        },
+    },
+}
diff --git a/lua/mason-registry/index.lua b/lua/mason-registry/index.lua
index cf0fcabd..ddfcbed9 100644
--- a/lua/mason-registry/index.lua
+++ b/lua/mason-registry/index.lua
@@ -17,8 +17,8 @@ return {
   clangd = "mason-registry.clangd",
   ["clarity-lsp"] = "mason-registry.clarity-lsp",
   ["clojure-lsp"] = "mason-registry.clojure-lsp",
-  ["cmake-format"] = "mason-registry.cmake-format",
   ["cmake-language-server"] = "mason-registry.cmake-language-server",
+  cmakelang = "mason-registry.cmakelang",
   codelldb = "mason-registry.codelldb",
   codeql = "mason-registry.codeql",
   codespell = "mason-registry.codespell",
diff --git a/lua/mason/mappings/language.lua b/lua/mason/mappings/language.lua
index d854e3ac..14bde3b6 100644
--- a/lua/mason/mappings/language.lua
+++ b/lua/mason/mappings/language.lua
@@ -19,7 +19,7 @@ return {
   clarity = { "clarity-lsp" },
   clojure = { "clojure-lsp" },
   clojurescript = { "clojure-lsp" },
-  cmake = { "cmake-format", "cmake-language-server" },
+  cmake = { "cmake-language-server", "cmakelang" },
   codeql = { "codeql" },
   crystal = { "crystalline" },
   css = { "css-lsp", "cssmodules-language-server", "prettier", "prettierd", "tailwindcss-language-server" },