From 229abfe6347faba1901de8fdd298739173092f1c Mon Sep 17 00:00:00 2001
From: anntnzrb <anntnzrb@proton.me>
Date: Thu, 4 Jun 2026 23:49:47 -0500
Subject: [PATCH 1/2] maintainers: add anntnzrb

Assisted-by: OpenAI ChatGPT
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 65f863a17051..83d7fc282d7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1910,6 +1910,11 @@
     githubId = 143312793;
     name = "Annin";
   };
+  anntnzrb = {
+    github = "anntnzrb";
+    githubId = 51257127;
+    name = "anntnzrb";
+  };
   anoa = {
     matrix = "@andrewm:amorgan.xyz";
     email = "andrew@amorgan.xyz";

From 23fe2ffa3f844330f2607fa7dd03b0b391032cbf Mon Sep 17 00:00:00 2001
From: anntnzrb <anntnzrb@proton.me>
Date: Thu, 4 Jun 2026 23:49:47 -0500
Subject: [PATCH 2/2] yashiki: init at 0.14.0

Assisted-by: OpenAI ChatGPT
---
 pkgs/by-name/ya/yashiki/package.nix | 69 +++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/ya/yashiki/package.nix

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
new file mode 100644
index 000000000000..fdcf7936644c
--- /dev/null
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+  apple-sdk_15,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "yashiki";
+  version = "0.14.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "typester";
+    repo = "yashiki";
+    tag = "yashiki-v${finalAttrs.version}";
+    hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ=";
+  };
+
+  cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  buildInputs = [
+    apple-sdk_15
+  ];
+
+  postInstall = ''
+    app="$out/Applications/Yashiki.app"
+
+    mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources/layouts"
+
+    ln -s "$out/bin/yashiki" "$app/Contents/MacOS/yashiki"
+    ln -s "$out/bin/yashiki-layout-tatami" "$app/Contents/Resources/layouts/yashiki-layout-tatami"
+    ln -s "$out/bin/yashiki-layout-byobu" "$app/Contents/Resources/layouts/yashiki-layout-byobu"
+
+    cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car"
+    substitute Info.plist.template "$app/Contents/Info.plist" \
+      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \
+      --replace-fail "<string>yashiki-launcher</string>" "<string>yashiki</string>"
+
+    installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "macOS tiling window manager";
+    homepage = "https://github.com/typester/yashiki";
+    changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    maintainers = with lib.maintainers; [ anntnzrb ];
+    mainProgram = "yashiki";
+    platforms = lib.platforms.darwin;
+  };
+})