diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/formatting.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/formatting.lua
index 54d0bb5..74e26d6 100644
--- a/bootstrap/config_dirs/nvim/lua/user/plugins/formatting.lua
+++ b/bootstrap/config_dirs/nvim/lua/user/plugins/formatting.lua
@@ -21,6 +21,7 @@ return {
 				lua = { "stylua" },
 				python = { "isort", "black" },
 				swift = { "swiftformat" },
+				sh = { "beautysh" },
 			},
 			format_on_save = {
 				lsp_fallback = true,
diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua
index 94110de..b8548a5 100644
--- a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua
+++ b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/lspconfig.lua
@@ -142,11 +142,6 @@ return {
 			on_attach = on_attach,
 		})
 
-		lspconfig["pkgbuild_language_server"].setup({
-			capabilities = capabilities,
-			on_attach = on_attach,
-		})
-
 		-- configure lua server (with special settings)
 		lspconfig["lua_ls"].setup({
 			capabilities = capabilities,
diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/mason.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/mason.lua
index 9194ce7..29a2184 100644
--- a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/mason.lua
+++ b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/mason.lua
@@ -49,13 +49,14 @@ return {
 				"stylua", -- lua formatter
 				"isort", -- python formatter
 				"black", -- python formatter
+				"shfmt", -- shell formatter
+				"beautysh", -- shell formatter
 				"pylint", -- python linter
 				"eslint_d", -- js linter
 				"shellcheck", -- bash linter
 				"commitlint", -- commit linter
 				"cspell", -- spell checker for code
 				"jsonlint", -- json linter
-				-- "quick-lint-ls", -- blazing fast alternative to eslint
 			},
 		})
 	end,
diff --git a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/none-ls.lua b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/none-ls.lua
index 0169fad..d68e335 100644
--- a/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/none-ls.lua
+++ b/bootstrap/config_dirs/nvim/lua/user/plugins/lsp/none-ls.lua
@@ -17,8 +17,14 @@ return {
 				"prettier", -- prettier formatter
 				"stylua", -- lua formatter
 				"black", -- python formatter
+				"shfmt", --shell formatter
+				"beautysh", --shell formatter
 				"pylint", -- python linter
 				"eslint_d", -- js linter
+				"shellcheck", -- bash linter
+				"commitlint", -- commit linter
+				"cspell", -- spell checker for code
+				"jsonlint", -- json linter
 			},
 		})
 
@@ -43,6 +49,8 @@ return {
 				formatting.stylua, -- lua formatter
 				formatting.isort,
 				formatting.black,
+				formatting.shfmt,
+				formatting.beautysh,
 				diagnostics.pylint,
 				diagnostics.eslint_d.with({ -- js/ts linter
 					condition = function(utils)