From 318cb8e22fa7dcdf691149b520b5d24428ee3cc9 Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 30 May 2020 11:27:45 -0700
Subject: [PATCH] Support multiple key files

---
 overlays/keyedgit.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/overlays/keyedgit.nix b/overlays/keyedgit.nix
index 7688ace..6cce6fe 100644
--- a/overlays/keyedgit.nix
+++ b/overlays/keyedgit.nix
@@ -3,16 +3,22 @@
 self: super: {
   keyedgit = keys:
     let
+      keyfile = if builtins.isList keys then
+        super.runCommand "keyfile" { } ''
+          cat ${super.lib.escapeShellArgs keys} > $out
+        ''
+      else
+        keys;
       homelessGPG = super.writeShellScript "homeless-gpg" ''
         export GNUPGHOME=$(mktemp -d)
         trap 'rm -r "$GNUPGHOME"' EXIT
         ${self.gnupg}/bin/gpg "$@"
       '';
-      keyring = super.runCommand "keyedkeyring.gpg" {} ''
-        ${homelessGPG} --no-default-keyring --keyring=$out --import ${keys}
+      keyring = super.runCommand "keyedkeyring.gpg" { } ''
+        ${homelessGPG} --no-default-keyring --keyring=$out --import ${keyfile}
       '';
-      keyids = super.runCommand "keyids" {} ''
-        ${homelessGPG} --no-default-keyring --with-colons --show-keys ${keys} |
+      keyids = super.runCommand "keyids" { } ''
+        ${homelessGPG} --no-default-keyring --with-colons --show-keys ${keyfile} |
           ${self.gawk}/bin/awk -F: '$1 == "pub" { print $5 }' > $out
       '';
       keyedGPG = super.writeShellScript "keyed-gpg" ''
-- 
2.44.1