diff --git a/modules/lang/fish/config.el b/modules/lang/fish/config.el
new file mode 100644
index 000000000..cb2d6b425
--- /dev/null
+++ b/modules/lang/fish/config.el
@@ -0,0 +1,9 @@
+;;; lang/fish/config.el -*- lexical-binding: t; -*-
+
+(def-package! fish-mode
+  :mode "\\.fish$"
+  :interpreter "fish"
+  :config
+  (add-hook! fish-mode
+    (add-hook 'before-save-hook #'fish_indent-before-save)))
+
diff --git a/modules/lang/fish/packages.el b/modules/lang/fish/packages.el
new file mode 100644
index 000000000..50c37611d
--- /dev/null
+++ b/modules/lang/fish/packages.el
@@ -0,0 +1,4 @@
+;; -*- no-byte-compile: t; -*-
+;;; lang/fish/packages.el
+
+(package! fish-mode)