feat: use yq as YAML formatter (#61)

kirillmorozov · Jul 8, 2024 · 824384c · 824384c
1 parent da282d9
commit 824384c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/neovim/init.lua b/neovim/init.lua
@@ -498,14 +498,12 @@ require("lazy").setup({
 				},
 			},
 			formatters_by_ft = {
-				go = {
-					{ "gofumpt", "gofmt" },
-				},
+				go = { { "gofumpt", "gofmt" } },
 				lua = { "stylua" },
 				python = { "ruff_format" },
 				sh = { "shfmt" },
 				terraform = { "terraform_fmt" },
-				yaml = { "yamlfmt" },
+				yaml = { { "yamlfmt", "yq" } },
 				json = { "jq" },
 				["_"] = { "trim_whitespace" },
 			},

diff --git a/vim/.vimrc b/vim/.vimrc
@@ -166,6 +166,8 @@ endif
 
 if executable("yamlfmt")
 	autocmd FileType yaml setlocal formatprg=yamlfmt\ -formatter\ retain_line_breaks=true\ -in
+elseif executable("yq")
+	autocmd FileType yaml setlocal formatprg=yq\ '.'
 endif
 
 if executable("jq")