diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7e99a5aba827..cab02069dcf3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5695,6 +5695,12 @@
     githubId = 1713676;
     name = "Luis G. Torres";
   };
+  giorgiga = {
+    email = "giorgio.gallo@bitnic.it";
+    github = "giorgiga";
+    githubId = 471835;
+    name = "Giorgio Gallo";
+  };
   GKasparov = {
     email = "mizozahr@gmail.com";
     github = "GKasparov";
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
index 3c3a99b35e56..739e81995233 100644
--- a/pkgs/shells/fish/plugins/default.nix
+++ b/pkgs/shells/fish/plugins/default.nix
@@ -48,6 +48,8 @@ lib.makeScope newScope (self: with self; {
 
   pure = callPackage ./pure.nix { };
 
+  sdkman-for-fish = callPackage ./sdkman-for-fish.nix { };
+
   sponge = callPackage ./sponge.nix { };
 
   tide = callPackage ./tide.nix { };
diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
new file mode 100644
index 000000000000..32e5317ed1cf
--- /dev/null
+++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix
@@ -0,0 +1,20 @@
+{ lib, buildFishPlugin, fetchFromGitHub }:
+
+buildFishPlugin rec {
+  pname = "sdkman-for-fish";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "reitzig";
+    repo = "sdkman-for-fish";
+    rev = "v${version}";
+    hash = "sha256-bfWQ2al0Xy8bnJt5euziHz/+qhyri4qWy47VDoPwQcg=";
+  };
+
+  meta = with lib; {
+    description = "Adds support for SDKMAN! to fish";
+    homepage = "https://github.com/reitzig/sdkman-for-fish";
+    license = licenses.mit;
+    maintainers = with maintainers; [ giorgiga ];
+  };
+}