diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6f3bcff13251..02e73e157ae6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6506,6 +6506,18 @@
     githubId = 8182846;
     name = "Francesco Gazzetta";
   };
+  fidgetingbits = {
+    name = "fidgetingbits";
+    email = "nixpkgs.xe7au@passmail.net";
+    matrix = "@fidgetingbits:matrix.org";
+    github = "fidgetingbits";
+    githubId = 13679876;
+    keys = [
+      { fingerprint = "U+vNNrQxJRj3NPu9EoD0LFZssRbk6LBg4YPN5nFvQvs"; }
+      { fingerprint = "lX5ewVcaQLxuzqI92gujs3jFNki4d8qF+PATexMijoQ"; }
+      { fingerprint = "elY15tXap1tddxbBVoUoAioe1u0RDWti5rc9cauSmwo"; }
+    ];
+  };
   figsoda = {
     email = "figsoda@pm.me";
     matrix = "@figsoda:matrix.org";
diff --git a/pkgs/by-name/zs/zsh-zhooks/package.nix b/pkgs/by-name/zs/zsh-zhooks/package.nix
new file mode 100644
index 000000000000..1fea11eb4e6a
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-zhooks/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation {
+  pname = "zsh-zhooks";
+  version = "0-unstable-10-31-2021";
+
+  src = fetchFromGitHub {
+    owner = "agkozak";
+    repo = "zhooks";
+    rev = "e6616b4a2786b45a56a2f591b79439836e678d22";
+    sha256 = "sha256-zahXMPeJ8kb/UZd85RBcMbomB7HjfEKzQKjF2NnumhQ=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -m755 -D zhooks.plugin.zsh --target-directory $out/share/zsh/zhooks
+  '';
+
+  meta = {
+    description = "A tool for displaying the code for all Zsh hook functions";
+    homepage = "https://github.com/agkozak/zhooks";
+    license = lib.licenses.mit;
+    longDescription = ''
+      This Zsh plugin is a tool for displaying the code for all Zsh hook functions (such as precmd), as well as the contents of
+      hook arrays (such as precmd_functions).
+    '';
+    maintainers = [ lib.maintainers.fidgetingbits ];
+  };
+}