diff --git a/neovim/dishvim.nix b/neovim/dishvim.nix
index 802da3eb..5b312aa3 100644
--- a/neovim/dishvim.nix
+++ b/neovim/dishvim.nix
@@ -3,6 +3,7 @@
   imports = [
     # keep-sorted start
     ./languages/css.nix
+    ./languages/fish.nix
     ./languages/json.nix
     ./languages/markdown.nix
     ./languages/rust.nix
diff --git a/neovim/languages/fish.nix b/neovim/languages/fish.nix
new file mode 100644
index 00000000..be6b1147
--- /dev/null
+++ b/neovim/languages/fish.nix
@@ -0,0 +1,22 @@
+{ lib, pkgs, ... }:
+{
+  config.vim = {
+    treesitter.grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+      fish
+    ];
+    formatter.conform-nvim.setupOpts = {
+      formatters_by_ft.fish = [ "fish_indent" ];
+      formatters.fish_indent = {
+        command = lib.meta.getExe' pkgs.fish "fish_indent";
+      };
+    };
+    diagnostics.nvim-lint = {
+      linters_by_ft.fish = [ "fish" ];
+      linters.fish = {
+        stdin = false;
+        cmd = lib.meta.getExe pkgs.fish;
+        args = [ "--no-execute" ];
+      };
+    };
+  };
+}