From 18f7104625b6ad6ab724420681b8807df768241f Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sun, 4 May 2025 13:11:35 +0200
Subject: [PATCH] feat: docker-compose improvements

---
 lua/weeheavy/autocmd.lua             | 11 +++++++++++
 lua/weeheavy/plugins/lsp/conform.lua |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lua/weeheavy/autocmd.lua b/lua/weeheavy/autocmd.lua
index 62b074b..3413efe 100644
--- a/lua/weeheavy/autocmd.lua
+++ b/lua/weeheavy/autocmd.lua
@@ -61,3 +61,14 @@ vim.api.nvim_create_autocmd("FileType", {
         vim.bo.commentstring = "# %s"
     end,
 })
+
+-- Force correct filetype for Docker compose files
+local ft_lsp_group = vim.api.nvim_create_augroup("ft_lsp_group", { clear = true })
+vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, {
+    pattern = { "docker_compose.yml", "docker_compose_*.yml" },
+    group = ft_lsp_group,
+    desc = "Force docker-compose ft",
+    callback = function()
+        vim.opt.filetype = "yaml.docker-compose"
+    end,
+})
diff --git a/lua/weeheavy/plugins/lsp/conform.lua b/lua/weeheavy/plugins/lsp/conform.lua
index f371ee3..615eeea 100644
--- a/lua/weeheavy/plugins/lsp/conform.lua
+++ b/lua/weeheavy/plugins/lsp/conform.lua
@@ -17,7 +17,9 @@ return {
                 html = { "prettier" },
                 json = { "prettier" },
                 yaml = { "prettier" },
+                -- yaml.docker-compose = { "prettier" },
                 markdown = { "prettier" },
+                text = { "woke" },
                 graphql = { "prettier" },
                 lua = { "stylua" },
                 python = { "isort", "black" },
@@ -27,7 +29,8 @@ return {
             },
             stop_after_first = false,
             format_on_save = {
-                lsp_fallback = true,
+                -- lsp_fallback = true,
+                lsp_format = "fallback",
                 async = false,
                 timeout_ms = 1000, -- default: 1000
             },