From fd09498990b8ea8496ed868d59ee7d72288ebaeb Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 25 Feb 2023 16:40:22 +0100 Subject: [PATCH] fix(gpg): don't use a symlink, change dir on darwin --- home/apps/gpg.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/home/apps/gpg.nix b/home/apps/gpg.nix index e1814c9..e7bb2cb 100644 --- a/home/apps/gpg.nix +++ b/home/apps/gpg.nix @@ -36,17 +36,13 @@ in { }; }; - #NOTE: yet another workaround for gpgme on Darwin, since Firefox isn't aware of $GNUPGHOME - home.activation = lib.mkIf isDarwin { - linkGnupgHome = lib.hm.dag.entryAfter ["writeBoundary"] '' - $DRY_RUN_CMD ln -s $VERBOSE_ARG \ - ${config.programs.gpg.homedir} ${config.home.homeDirectory}/.gnupg - ''; - }; - programs.gpg = { enable = true; - homedir = "${config.xdg.configHome}/gnupg"; + #NOTE: yet another workaround for gpgme on Darwin, since Firefox isn't aware of $GNUPGHOME + homedir = + if isDarwin + then "${config.home.homeDirectory}/.gnupg" + else "${config.xdg.configHome}/gnupg"; scdaemonSettings."disable-ccid" = true; settings = { # https://github.com/drduh/config/blob/master/gpg.conf