diff --git a/Containerfile b/Containerfile
index 47bb5fb..800026f 100644
--- a/Containerfile
+++ b/Containerfile
@@ -20,7 +20,8 @@ ENV NEOVIM_PKGS="\
     wl-clipboard \
     ansible-config \
     ansible \
-    libicu"
+    libicu \
+    cmake"
 
 ENV GENERAL_PKGS="\
     tar \
@@ -33,6 +34,7 @@ ENV MASON_PKGS=" \
     css-lsp \
     cssmodules-language-server \
     dockerfile-language-server \
+    cmake-language-server \
     html-lsp \
     json-lsp \
     marksman \
diff --git a/lua/plugins/mason-lspconfig.lua b/lua/plugins/mason-lspconfig.lua
index db7df5e..fd8ad2e 100644
--- a/lua/plugins/mason-lspconfig.lua
+++ b/lua/plugins/mason-lspconfig.lua
@@ -29,5 +29,6 @@ return {
         --   - { exclude: string[] }: All servers set up via lspconfig, except the ones provided in the list, are automatically installed.
         --       Example: automatic_installation = { exclude = { "rust_analyzer", "solargraph" } }
         automatic_installation = true,
+        automatic_enable = true
     }
 }
diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua
index 46f24df..aee88c7 100644
--- a/lua/plugins/nvim-lspconfig.lua
+++ b/lua/plugins/nvim-lspconfig.lua
@@ -191,5 +191,13 @@ return {
             on_attach = on_attach,
             capabilities = capabilities,
         }
+        require 'lspconfig'.clangd.setup {
+            on_attach = on_attach,
+            capabilities = capabilities,
+        }
+        require 'lspconfig'.cmake.setup {
+            on_attach = on_attach,
+            capabilities = capabilities,
+        }
     end
 }
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 022b116..90d6a0e 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -2,7 +2,7 @@ return function()
     require 'nvim-treesitter.configs'.setup {
         -- A list of parser names, or "all"
         ensure_installed = { "helm", "awk", "bash", "comment",
-            "css", "csv", "devicetree", "diff", "dockerfile", "git_config",
+            "css", "csv", "c", "cmake", "devicetree", "diff", "dockerfile", "git_config",
             "git_rebase", "gitattributes", "gitcommit",
             "html", "htmldjango", "http", "ini",
             "json", "kconfig",