From 6d04d8643c699d5bd26fd3adfaca717b59dc58de Mon Sep 17 00:00:00 2001
From: Mr-Stoneman <mrstoneman@sten.rocks>
Date: Tue, 12 May 2026 22:49:56 +0200
Subject: [PATCH 1/2] maintainers: add Mr-Stoneman

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bd3a40644c0e..21efcef72bc1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18438,6 +18438,12 @@
     githubId = 2072185;
     name = "Marc Scholten";
   };
+  Mr-Stoneman = {
+    email = "mrstoneman@sten.rocks";
+    github = "Mr-Stoneman";
+    githubId = 72991726;
+    name = "Mr-Stoneman";
+  };
   mrbenjadmin = {
     email = "mrbenjadmin@gmail.com";
     github = "mrbenjadmin";

From 11a88ed4561e3f078c468dd54a8d082000fd0c46 Mon Sep 17 00:00:00 2001
From: Mr-Stoneman <mrstoneman@sten.rocks>
Date: Tue, 12 May 2026 22:48:13 +0200
Subject: [PATCH 2/2] zapp: init at 1.0.1

---
 pkgs/by-name/za/zapp/package.nix | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/za/zapp/package.nix

diff --git a/pkgs/by-name/za/zapp/package.nix b/pkgs/by-name/za/zapp/package.nix
new file mode 100644
index 000000000000..434e70381090
--- /dev/null
+++ b/pkgs/by-name/za/zapp/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  udev,
+  stdenv,
+  pkg-config,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "zapp";
+  version = "1.0.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "zsa";
+    repo = "zapp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KhWL+SsN1z9qpxwHpaqRo3qAk7xAOHVkRAOa02Q2Myc=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
+
+  cargoHash = "sha256-gDyNwHrMdNQdKdr9RGfwFAU8IaUlGrlJxV0WClQ25JM=";
+  passthru.updateScript = nix-update-script { };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Flash ZSA keyboards from your terminal";
+    homepage = "https://github.com/zsa/zapp";
+    license = with lib.licenses; [
+      mit
+      commons-clause
+    ];
+    maintainers = with lib.maintainers; [ Mr-Stoneman ];
+    mainProgram = "zapp";
+  };
+})