diff --git a/.config/nvim/lua/plugins/language-server.lua b/.config/nvim/lua/plugins/language-server.lua
index a697ef2..50b7e0f 100644
--- a/.config/nvim/lua/plugins/language-server.lua
+++ b/.config/nvim/lua/plugins/language-server.lua
@@ -1,75 +1,112 @@
 return {
-  {
-    "mason-org/mason.nvim",
-    tag = "v1.11.0",
-    config = function()
-      require("mason").setup({})
-    end,
-  },
-  {
-    "mason-org/mason-lspconfig.nvim",
-    tag = "v1.32.0",
-    config = function()
-      require("mason-lspconfig").setup({
-        ensure_installed = {
-          "lua_ls",
-          "bashls",
-          "dockerls",
-          --"gh-actions-language-server",
-          "helm_ls",
-          "jsonls",
-          "marksman",
-          "nginx_language_server",
-          "basedpyright",
-          "ruff",
-          "yamlls",
-        },
-      })
-    end,
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    config = function()
-      local null_ls = require("null-ls")
-      null_ls.setup({
-        sources = {
-          null_ls.builtins.formatting.stylua,
-          null_ls.builtins.formatting.mdformat,
-        },
-      })
-      vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, { desc = "Auto-Format File" })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    tag = "v1.8.0",
-    lazy = true,
-    event = { "BufReadPost", "BufNewFile" },
-    dependencies = {
-      "mason-org/mason.nvim",
-      "mason-org/mason-lspconfig.nvim",
-    },
-    config = function()
-      local capabilities = require("cmp_nvim_lsp").default_capabilities()
-      local lspconfig = require("lspconfig")
-      lspconfig.ts_ls.setup({
-        capabilities = capabilities,
-      })
-      lspconfig.lua_ls.setup({ capabilities = capabilities })
-      lspconfig.bashls.setup({ capabilities = capabilities })
-      lspconfig.dockerls.setup({ capabilities = capabilities })
-      lspconfig.helm_ls.setup({ capabilities = capabilities })
-      lspconfig.jsonls.setup({ capabilities = capabilities })
-      lspconfig.nginx_language_server.setup({ capabilities = capabilities })
-      lspconfig.marksman.setup({ capabilities = capabilities })
-      lspconfig.basedpyright.setup({ capabilities = capabilities })
-      lspconfig.ruff.setup({
-        capabilities = capabilities,
-      })
-      lspconfig.yamlls.setup({ capabilities = capabilities })
-      vim.keymap.set("n", "<leader>vd", vim.lsp.buf.hover, { desc = "View Docstring" })
-      vim.keymap.set("n", "<leader>gt", vim.lsp.buf.definition, { desc = "Go To Definition" })
-      vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })
-    end,
-  },
+	{
+		"mason-org/mason.nvim",
+		tag = "v1.11.0",
+		config = function()
+			require("mason").setup({})
+		end,
+	},
+	{
+		"WhoIsSethDaniel/mason-tool-installer.nvim",
+		config = function()
+			require("mason-tool-installer").setup({
+				ensure_installed = {
+					"stylua",
+					"mdformat",
+					"hadolint",
+					"yamllint",
+					"gh-actions-language-server",
+				},
+			})
+		end,
+	},
+	{
+		"mason-org/mason-lspconfig.nvim",
+		tag = "v1.32.0",
+		config = function()
+			require("mason-lspconfig").setup({
+				ensure_installed = {
+					"lua_ls",
+					"bashls",
+					--"helm_ls",
+					"jsonls",
+					"nginx_language_server",
+					"basedpyright",
+					"ruff",
+					"yamlls",
+				},
+			})
+		end,
+	},
+	{
+		"nvimtools/none-ls.nvim",
+		config = function()
+			local null_ls = require("null-ls")
+			null_ls.setup({
+				sources = {
+					null_ls.builtins.formatting.stylua,
+					null_ls.builtins.formatting.mdformat,
+					null_ls.builtins.diagnostics.hadolint,
+					null_ls.builtins.diagnostics.yamllint.with({
+						extra_args = { "-d", "rules:\n  document-start: disable" },
+					}),
+				},
+			})
+			vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, { desc = "Auto-Format File" })
+		end,
+	},
+	{
+		"neovim/nvim-lspconfig",
+		tag = "v1.8.0",
+		lazy = true,
+		event = { "BufReadPost", "BufNewFile" },
+		dependencies = {
+			"mason-org/mason.nvim",
+			"mason-org/mason-lspconfig.nvim",
+      "WhoIsSethDaniel/mason-tool-installer.nvim",
+		},
+		config = function()
+			local capabilities = require("cmp_nvim_lsp").default_capabilities()
+			local lspconfig = require("lspconfig")
+			lspconfig.ts_ls.setup({
+				capabilities = capabilities,
+			})
+			lspconfig.lua_ls.setup({ capabilities = capabilities })
+			lspconfig.bashls.setup({
+				capabilities = capabilities,
+				cmd = { "bash-language-server", "start" },
+				filetypes = { "sh", "bash" },
+			})
+			lspconfig.gh_actions_ls.setup({ capabilities = capabilities })
+			--	lspconfig.helm_ls.setup({ capabilities = capabilities })
+			lspconfig.jsonls.setup({ capabilities = capabilities })
+			lspconfig.basedpyright.setup({
+				capabilities = capabilities,
+				settings = {
+					basedpyright = {
+						analysis = {
+							typeCheckingMode = "off",
+							diagnosticSeverityOverrides = {
+								reportUnusedImport = false,
+								reportUnusedVariable = false,
+							},
+						},
+					},
+				},
+			})
+			lspconfig.nginx_language_server.setup({ capabilities = capabilities })
+			lspconfig.ruff.setup({
+				capabilities = capabilities,
+				init_options = {
+					settings = {
+						lineLength = 79,
+					},
+				},
+			})
+			lspconfig.yamlls.setup({ capabilities = capabilities })
+			vim.keymap.set("n", "<leader>vd", vim.lsp.buf.hover, { desc = "View Docstring" })
+			vim.keymap.set("n", "<leader>gt", vim.lsp.buf.definition, { desc = "Go To Definition" })
+			vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })
+		end,
+	},
 }