diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 52660e52..fffc2262 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,6 +8,7 @@
     "foxundermoon.shell-format",
     "tamasfe.even-better-toml",
     "jnoortheen.nix-ide",
-    "thenuprojectcontributors.vscode-nushell-lang"
+    "thenuprojectcontributors.vscode-nushell-lang",
+    "bmalehorn.vscode-fish"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0c913feb..04311688 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,6 +7,9 @@
   "[nix]": {
     "editor.defaultFormatter": "jnoortheen.nix-ide"
   },
+  "[fish]": {
+    "editor.defaultFormatter": "bmalehorn.vscode-fish"
+  },
   "nix.serverPath": "nil",
   "nix.enableLanguageServer": true,
   "nix.serverSettings": {