diff --git a/README.md b/README.md index e37d2bb1ca..6f5ef7b898 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ nvim ## Formatters -- beautysh - black - clang-format - gofmt @@ -79,6 +78,7 @@ nvim - markdownlint - prettier - rubocop +- shfmt - stylua - terraform_fmt - yamlfmt diff --git a/lua/custom/configs/mason.lua b/lua/custom/configs/mason.lua index 3233b0ec7b..c3d339dcbe 100644 --- a/lua/custom/configs/mason.lua +++ b/lua/custom/configs/mason.lua @@ -3,7 +3,6 @@ local M = {} M.opts = { ensure_installed = { "bash-language-server", - "beautysh", "black", "clangd", "clang-format", @@ -25,6 +24,7 @@ M.opts = { "prettier", "pyright", "rubocop", + "shfmt", "vim-language-server", "yamlfmt", "yaml-language-server", diff --git a/lua/custom/configs/null-ls.lua b/lua/custom/configs/null-ls.lua index 537fb0b5e7..493dec2188 100644 --- a/lua/custom/configs/null-ls.lua +++ b/lua/custom/configs/null-ls.lua @@ -10,7 +10,6 @@ local opts = { vim.fn.expand "~/.config/nvim/configs/markdownlint.yaml", }, }, - null_ls.builtins.formatting.beautysh, null_ls.builtins.formatting.black, null_ls.builtins.formatting.clang_format, null_ls.builtins.formatting.gofmt, @@ -23,6 +22,7 @@ local opts = { }, }, null_ls.builtins.formatting.rubocop, + null_ls.builtins.formatting.shfmt, null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.terraform_fmt, null_ls.builtins.formatting.yamlfmt,