diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b9cc3b38425e..8bffb369bdbe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18879,6 +18879,12 @@
     githubId = 4201956;
     name = "pongo1231";
   };
+  poopsicles = {
+    name = "Fumnanya";
+    email = "fmowete@outlook.com";
+    github = "poopsicles";
+    githubId = 87488715;
+  };
   PopeRigby = {
     name = "PopeRigby";
     github = "poperigby";
diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix
new file mode 100644
index 000000000000..d3c73f9fa685
--- /dev/null
+++ b/pkgs/by-name/mo/mochi/package.nix
@@ -0,0 +1,65 @@
+{
+  _7zz,
+  appimageTools,
+  fetchurl,
+  fetchzip,
+  lib,
+  stdenvNoCC,
+  xorg,
+}:
+
+let
+  pname = "mochi";
+  version = "1.18.7";
+
+  linux = appimageTools.wrapType2 rec {
+    inherit pname version meta;
+
+    src = fetchurl {
+      url = "https://mochi.cards/releases/Mochi-${version}.AppImage";
+      hash = "sha256-FCh8KLnvs26GKTVJY4Tqp+iA8sNlK7e0rv+oywBIF+U=";
+    };
+
+    appimageContents = appimageTools.extractType2 { inherit pname version src; };
+
+    extraPkgs = pkgs: [ xorg.libxshmfence ];
+
+    extraInstallCommands = ''
+      install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/
+      install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/
+      substituteInPlace $out/share/applications/${pname}.desktop \
+        --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
+    '';
+  };
+
+  darwin = stdenvNoCC.mkDerivation {
+    inherit pname version meta;
+
+    src = fetchzip {
+      url = "https://mochi.cards/releases/Mochi-${version}.dmg";
+      hash = "sha256-W3JqEPF8iCiXlKqjPoFcm7lP+n3lN4XBeAQdBEWvy8s=";
+      stripRoot = false;
+      nativeBuildInputs = [ _7zz ];
+    };
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications
+
+      runHook postInstall
+    '';
+  };
+
+  meta = {
+    description = "Simple markdown-powered SRS app";
+    homepage = "https://mochi.cards/";
+    changelog = "https://mochi.cards/changelog.html";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ poopsicles ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+in
+if stdenvNoCC.hostPlatform.isDarwin then darwin else linux