diff --git a/init.example.el b/init.example.el
index f2f1140ef..469ba9f5d 100644
--- a/init.example.el
+++ b/init.example.el
@@ -86,7 +86,6 @@
       ;elm               ; care for a cup of TEA?
        emacs-lisp        ; drown in parentheses
       ;ess               ; emacs speaks statistics
-      ;fish              ; finally, a decent shell
       ;go                ; the hipster dialect
       ;(haskell +intero) ; a language that's lazier than I am
       ;hy                ; readability of scheme w/ speed of python
@@ -116,7 +115,7 @@
       ;ruby              ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
       ;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
       ;scala             ; java, but good
-       sh                ; she sells (ba|z)sh shells on the C xor
+       (sh +fish)        ; she sells (ba|z)sh shells on the C xor
       ;solidity          ; do you need a blockchain? No.
       ;swift             ; who asked for emoji variables?
       ;web               ; the tubes
diff --git a/modules/lang/fish/config.el b/modules/lang/fish/config.el
deleted file mode 100644
index cb2d6b425..000000000
--- a/modules/lang/fish/config.el
+++ /dev/null
@@ -1,9 +0,0 @@
-;;; 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
deleted file mode 100644
index 50c37611d..000000000
--- a/modules/lang/fish/packages.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; lang/fish/packages.el
-
-(package! fish-mode)
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index 2c1d7e748..e739f2f00 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -62,3 +62,9 @@
   (set-company-backend! 'sh-mode '(company-shell company-files))
   (setq company-shell-delete-duplicates t))
 
+(def-package! fish-mode
+  :when (featurep! +fish)
+  :defer t
+  :config
+  (add-hook! fish-mode
+    (add-hook 'before-save-hook #'fish_indent-before-save)))
diff --git a/modules/lang/sh/packages.el b/modules/lang/sh/packages.el
index 11f456485..d3e3ad9e1 100644
--- a/modules/lang/sh/packages.el
+++ b/modules/lang/sh/packages.el
@@ -6,3 +6,6 @@
 
 (when (featurep! :completion company)
   (package! company-shell))
+
+(when (featurep! +fish)
+  (package! fish-mode))