diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix
index fa633521..ebf1932a 100644
--- a/home-manager/modules/nvim.nix
+++ b/home-manager/modules/nvim.nix
@@ -96,6 +96,7 @@ in {
       marksman
       sumneko-lua-language-server
       nodePackages_latest.typescript-language-server
+      yaml-language-server
 
       # this includes css-lsp, html-lsp, json-lsp, eslint-lsp
       nodePackages_latest.vscode-langservers-extracted
diff --git a/nvim/lua/my/lsp/filetypes.lua b/nvim/lua/my/lsp/filetypes.lua
index b0ea944b..4662020d 100644
--- a/nvim/lua/my/lsp/filetypes.lua
+++ b/nvim/lua/my/lsp/filetypes.lua
@@ -65,6 +65,10 @@ M.config = {
     formatter = 'fish_indent',
     linter = 'fish',
   },
+  ['yaml'] = {
+    lspconfig = 'yamlls',
+    treesitter = { 'yaml' },
+  },
 }
 
 M.filetypes = vim.tbl_keys(M.config)