diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 37772e1e629b..b8b1388843d3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17596,6 +17596,12 @@
     githubId = 43755002;
     name = "Dmitriy P";
   };
+  pta2002 = {
+    email = "pta2002@pta2002.com";
+    github = "pta2002";
+    githubId = 7443916;
+    name = "Pedro Alves";
+  };
   ptival = {
     email = "valentin.robert.42@gmail.com";
     github = "Ptival";
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix
new file mode 100644
index 000000000000..dfd8d36061fa
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bubble-card";
+  version = "2.2.4";
+
+  dontBuild = true;
+
+  src = fetchFromGitHub {
+    owner = "Clooos";
+    repo = "Bubble-Card";
+    rev = "v${version}";
+    hash = "sha256-vsgu1hvtlppADvaFLeB4xQHbP3wBc6H4p5HbeS3JY80=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    install -m0644 dist/bubble-card.js $out
+    install -m0644 dist/bubble-pop-up-fix.js $out
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    changelog = "https://github.com/Clooos/bubble-card/releases/tag/v${version}";
+    description = "Bubble Card is a minimalist card collection for Home Assistant with a nice pop-up touch.";
+    homepage = "https://github.com/Clooos/Bubble-Card";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pta2002 ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
index 80c92cded6b3..c4ddd97b7749 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
@@ -9,6 +9,8 @@
 
   atomic-calendar-revive = callPackage ./atomic-calendar-revive { };
 
+  bubble-card = callPackage ./bubble-card { };
+
   button-card = callPackage ./button-card { };
 
   card-mod = callPackage ./card-mod { };