diff --git a/flake.nix b/flake.nix
index 1a64d2c..8432a48 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,6 +135,7 @@
           rubyPackages.erb-formatter
           ruff
           shellcheck
+          shfmt
           sqlfluff
           stdenv.cc.cc
           stylelint
diff --git a/lua/plugins/conform-nvim.lua b/lua/plugins/conform-nvim.lua
index 041110e..4b583bd 100644
--- a/lua/plugins/conform-nvim.lua
+++ b/lua/plugins/conform-nvim.lua
@@ -9,6 +9,18 @@ return {
         liquid = { 'prettier' },
         nix = { 'alejandra' },
         scss = { 'stylelint' },
+        sh = { 'shellcheck', 'shfmt' },
+      },
+
+      formatters = {
+        shfmt = {
+          prepend_args = {
+            '--indent=2',
+            '--case-indent',
+            '--binary-next-line',
+            '--func-next-line',
+          },
+        },
       },
     },
   },