diff --git a/pkgs/shells/fish/plugins/autopair-fish.nix b/pkgs/shells/fish/plugins/autopair-fish.nix
new file mode 100644
index 000000000000..292d492f2046
--- /dev/null
+++ b/pkgs/shells/fish/plugins/autopair-fish.nix
@@ -0,0 +1,20 @@
+{ lib, stdenv, buildFishPlugin, fetchFromGitHub }:
+
+buildFishPlugin rec {
+  pname = "autopair.fish";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "jorgebucaran";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU=";
+  };
+
+  meta = with lib; {
+    description = "Auto-complete matching pairs in the Fish command line.";
+    homepage = "https://github.com/jorgebucaran/autopair.fish";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thehedgeh0g ];
+  };
+}
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
index 1adf040d64f9..0cc6eb6b89ed 100644
--- a/pkgs/shells/fish/plugins/default.nix
+++ b/pkgs/shells/fish/plugins/default.nix
@@ -2,6 +2,8 @@
 
 lib.makeScope newScope (self: with self; {
 
+  autopair-fish = callPackage ./autopair-fish.nix { };
+
   buildFishPlugin = callPackage ./build-fish-plugin.nix { };
 
   clownfish = callPackage ./clownfish.nix { };