diff --git a/lua/gabrielgio/formatter.lua b/lua/gabrielgio/formatter.lua
index 68c8bacb97a03906ea1fc08c3d359eb5c46b348a..7f400b61f6135b1096182a58aa8e82b0d3ea28c0 100644
--- a/lua/gabrielgio/formatter.lua
+++ b/lua/gabrielgio/formatter.lua
@@ -4,6 +4,7 @@ formatter.setup({
 	filetype = {
 		nix = { require("formatter.filetypes.nix").alejandra },
 		lua = { require("formatter.filetypes.lua").stylua },
+		fish = { require("formatter.filetypes.fish").fishindent },
 	},
 	["*"] = {
 		require("formatter.filetypes.any").remove_trailing_whitespace,
diff --git a/lua/gabrielgio/linter.lua b/lua/gabrielgio/linter.lua
index c2d45034d61f7f71f3b3b6dd783c4833a63d92db..b40c28fe3276766625b9665932a37e2f9a4dcf7d 100644
--- a/lua/gabrielgio/linter.lua
+++ b/lua/gabrielgio/linter.lua
@@ -4,6 +4,7 @@ lint.linters_by_ft = {
 	go = { "golangcilint" },
 	lua = { "luacheck" },
 	javascript = { "prettier" },
+	fish = { "fish" },
 }
 
 vim.api.nvim_create_autocmd({ "BufWritePost" }, {