From c3cff455d08edf687d89c2c82c9d79c305df9307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Aug 2024 11:22:03 +0200 Subject: [PATCH] escape age key file --- modules/nix-darwin/sops.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/nix-darwin/sops.nix b/modules/nix-darwin/sops.nix index bb42440..d01e4cd 100644 --- a/modules/nix-darwin/sops.nix +++ b/modules/nix-darwin/sops.nix @@ -94,18 +94,20 @@ let manifest = manifestFor "" cfg.secrets; + escapedAgeKeyFile = lib.escapeShellArg cfg.age.keyFile; + script = toString (pkgs.writeShellScript "sops-nix-user" ((lib.optionalString (cfg.gnupg.home != null) '' export SOPS_GPG_EXEC=${pkgs.gnupg}/bin/gpg '') + (lib.optionalString cfg.age.generateKey '' - if [[ ! -f '${cfg.age.keyFile}' ]]; then + if [[ ! -f ${escapedAgeKeyFile} ]]; then echo generating machine-specific age key... - ${pkgs.coreutils}/bin/mkdir -p $(${pkgs.coreutils}/bin/dirname ${cfg.age.keyFile}) + ${pkgs.coreutils}/bin/mkdir -p $(${pkgs.coreutils}/bin/dirname ${escapedAgeKeyFile}) # age-keygen sets 0600 by default, no need to chmod. - ${pkgs.age}/bin/age-keygen -o ${cfg.age.keyFile} + ${pkgs.age}/bin/age-keygen -o ${escapedAgeKeyFile} fi '' + '' - ${sops-install-secrets}/bin/sops-install-secrets -ignore-passwd '${manifest}' + ${sops-install-secrets}/bin/sops-install-secrets -ignore-passwd ${manifest} ''))); in { options.sops = {