diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08150dc637e9..e3d1f7059fdf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -505,6 +505,18 @@
     githubId = 1517066;
     name = "Aiken Cairncross";
   };
+  acaloiaro = {
+    email = "code@adriano.fyi";
+    githubId = 3331648;
+    github = "acaloiaro";
+    matrix = "@adriano@beeper.com";
+    name = "Adriano Caloiaro";
+    keys = [
+      {
+        fingerprint = "DCBD 2175 8A30 9C1F 41D7  A0FC 890F FDB1 1860 FE1C";
+      }
+    ];
+  };
   a-camarillo = {
     name = "Anthony Camarillo";
     email = "anthony.camarillo.96@gmail.com";
diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
new file mode 100644
index 000000000000..439237d27497
--- /dev/null
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  nix-update-script,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "di-tui";
+  version = "1.11.1";
+
+  src = fetchFromGitHub {
+    owner = "acaloiaro";
+    repo = "di-tui";
+    rev = "v${version}";
+    hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
+  };
+
+  vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A simple terminal UI player for di.fm";
+    homepage = "https://github.com/acaloiaro/di-tui";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.acaloiaro ];
+    mainProgram = "di-tui";
+  };
+}