diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index 88173b4..ddc5e79 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -35,6 +35,7 @@ in
         python3Packages.python-lsp-server
         rnix-lsp
         shellcheck
+        yaml-language-server
 
         # Formatters
         nixfmt
diff --git a/modules/home-manager/cli/neovim/files/lspconfig.lua b/modules/home-manager/cli/neovim/files/lspconfig.lua
index ae56e2b..6ddfddf 100644
--- a/modules/home-manager/cli/neovim/files/lspconfig.lua
+++ b/modules/home-manager/cli/neovim/files/lspconfig.lua
@@ -21,6 +21,8 @@ lspconfig.pylsp.setup {
         }
     }
 }
+lspconfig.yamlls.setup{}
+
 vim.api.nvim_create_autocmd('LspAttach', {
   desc = 'LSP actions',
   callback = function()