From 0163695ad46083b4e91ea5513ba49fcd8ef76f73 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Thu, 18 Dec 2025 18:21:37 -0500
Subject: [PATCH] khd: drop

---
 pkgs/by-name/kh/khd/org.nixos.khd.plist | 33 -----------------
 pkgs/by-name/kh/khd/package.nix         | 48 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 3 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 pkgs/by-name/kh/khd/org.nixos.khd.plist
 delete mode 100644 pkgs/by-name/kh/khd/package.nix

diff --git a/pkgs/by-name/kh/khd/org.nixos.khd.plist b/pkgs/by-name/kh/khd/org.nixos.khd.plist
deleted file mode 100644
index 3c0aaa81eb61..000000000000
--- a/pkgs/by-name/kh/khd/org.nixos.khd.plist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>org.nixos.khd</string>
-  <key>ProgramArguments</key>
-  <array>
-  <string>@out@/bin/khd</string>
-  </array>
-  <key>KeepAlive</key>
-  <true/>
-  <key>ProcessType</key>
-  <string>Interactive</string>
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>PATH</key>
-    <string>@out@/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-  </dict>
-  <key>Sockets</key>
-  <dict>
-    <key>Listeners</key>
-    <dict>
-      <key>SockServiceName</key>
-      <string>3021</string>
-      <key>SockType</key>
-      <string>dgram</string>
-      <key>SockFamily</key>
-      <string>IPv4</string>
-    </dict>
-  </dict>
-</dict>
-</plist>
diff --git a/pkgs/by-name/kh/khd/package.nix b/pkgs/by-name/kh/khd/package.nix
deleted file mode 100644
index 2877355808f2..000000000000
--- a/pkgs/by-name/kh/khd/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "khd";
-  version = "3.0.0";
-
-  src = fetchFromGitHub {
-    owner = "koekeishiya";
-    repo = "khd";
-    rev = "v${version}";
-    sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
-  };
-
-  patches = [
-    # Fixes build issues, remove with >3.0.0
-    (fetchpatch {
-      url = "https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch";
-      sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np";
-    })
-  ];
-
-  buildPhase = ''
-    make install
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/khd $out/bin/khd
-
-    mkdir -p $out/Library/LaunchDaemons
-    cp ${./org.nixos.khd.plist} $out/Library/LaunchDaemons/org.nixos.khd.plist
-    substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out
-  '';
-
-  meta = {
-    description = "Simple modal hotkey daemon for OSX";
-    homepage = "https://github.com/koekeishiya/khd";
-    downloadPage = "https://github.com/koekeishiya/khd/releases";
-    platforms = lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ lnl7 ];
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6a29a1e02b88..9cb69af9b892 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -789,6 +789,7 @@ mapAliases {
   keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
   keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08
   kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
+  khd = throw "'khd' has been removed as it has been pulled upstream"; # Added 2025-12-18
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30