From 9c2b3a8dee9312bb6d45270587b25a2c1a877dc1 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 9 Feb 2026 11:12:35 +0100
Subject: [PATCH] [Docker] Fix filetypes

---
 nvim/init.lua                      |  1 +
 nvim/lua/filetypes.lua             |  8 +++
 nvim/lua/plugins/lsp/lspconfig.lua |  1 +
 nvim/lua/plugins/lsp/mason.lua     | 97 +++++++++++++++---------------
 4 files changed, 59 insertions(+), 48 deletions(-)
 create mode 100644 nvim/lua/filetypes.lua

diff --git a/nvim/init.lua b/nvim/init.lua
index 466c22b..0fa6f10 100755
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,3 +1,4 @@
 require("options")
 require("keybinds")
 require("lazy-conf")
+require("filetypes")
diff --git a/nvim/lua/filetypes.lua b/nvim/lua/filetypes.lua
new file mode 100644
index 0000000..e8f28e1
--- /dev/null
+++ b/nvim/lua/filetypes.lua
@@ -0,0 +1,8 @@
+vim.filetype.add({
+	pattern = {
+		["compose.*%.ya?ml"] = "yaml.docker-compose",
+		["docker%-compose.*%.ya?ml"] = "yaml.docker-compose",
+		[".*/.gitea/workflows/.*%.ya?ml"] = "yaml.actions",
+		[".*/.github/workflows/.*%.ya?ml"] = "yaml.actions",
+	},
+})
diff --git a/nvim/lua/plugins/lsp/lspconfig.lua b/nvim/lua/plugins/lsp/lspconfig.lua
index 0723d3c..9794444 100755
--- a/nvim/lua/plugins/lsp/lspconfig.lua
+++ b/nvim/lua/plugins/lsp/lspconfig.lua
@@ -26,6 +26,7 @@ return {
         require("plugins.lsp.ls.c")
         require("plugins.lsp.ls.dart")
         require("plugins.lsp.ls.docker")
+        require("plugins.lsp.ls.gh-actions")
         require("plugins.lsp.ls.go")
         require("plugins.lsp.ls.hypr")
         require("plugins.lsp.ls.low-level")
diff --git a/nvim/lua/plugins/lsp/mason.lua b/nvim/lua/plugins/lsp/mason.lua
index f34af75..80c3c7a 100755
--- a/nvim/lua/plugins/lsp/mason.lua
+++ b/nvim/lua/plugins/lsp/mason.lua
@@ -1,53 +1,54 @@
 return {
-    -- lsp package manager
-    "mason-org/mason.nvim",
-    dependencies = {
-        "mason-org/mason-lspconfig.nvim",
-    },
-    config = function()
-        -- import mason
-        local mason = require("mason")
+	-- lsp package manager
+	"mason-org/mason.nvim",
+	dependencies = {
+		"mason-org/mason-lspconfig.nvim",
+	},
+	config = function()
+		-- import mason
+		local mason = require("mason")
 
-        -- import mason-lspconfig
-        local mason_lspconfig = require("mason-lspconfig")
+		-- import mason-lspconfig
+		local mason_lspconfig = require("mason-lspconfig")
 
-        -- enable mason and configure icons
-        mason.setup({
-            ui = {
-                icons = {
-                    package_installed = "✔",
-                    package_pending = "➜",
-                    package_uninstalled = "✗",
-                },
-            },
-        })
+		-- enable mason and configure icons
+		mason.setup({
+			ui = {
+				icons = {
+					package_installed = "✔",
+					package_pending = "➜",
+					package_uninstalled = "✗",
+				},
+			},
+		})
 
-        -- list of servers for mason to install
-        mason_lspconfig.setup({
-            ensure_installed = {
-                "asm_lsp",
-                "bashls",
-                "clangd",
-                "cmake",
-                "cssls",
-                "docker_language_server",
-                "gopls",
-                "html",
-                "hyprls",
-                "jdtls",
-                "jsonls",
-                "marksman",
-                "lua_ls",
-                "phpactor",
-                "pyright",
-                "rust_analyzer",
-                "ruby_lsp",
-                "verible",
-                "vtsls",
-                "vue_ls",
-            },
-            -- auto-install configured servers (with lspconfig)
-            automatic_enable = false
-        })
-    end,
+		-- list of servers for mason to install
+		mason_lspconfig.setup({
+			ensure_installed = {
+				"asm_lsp",
+				"bashls",
+				"clangd",
+				"cmake",
+				"cssls",
+				"docker_language_server",
+				"gh_actions_ls",
+				"gopls",
+				"html",
+				"hyprls",
+				"jdtls",
+				"jsonls",
+				"marksman",
+				"lua_ls",
+				"phpactor",
+				"pyright",
+				"rust_analyzer",
+				"ruby_lsp",
+				"verible",
+				"vtsls",
+				"vue_ls",
+			},
+			-- auto-install configured servers (with lspconfig)
+			automatic_enable = false,
+		})
+	end,
 }