+1 -10

home/base/gpg.nix

reviewed

··· 22 22 23 23 services.gpg-agent = { 24 24 enable = true; 25 25 - # See: https://github.com/nix-community/home-manager/pull/5901 26 26 - enableSshSupport = !helpers.isDarwin; 25 25 + enableSshSupport = true; 27 26 verbose = true; 28 27 sshKeys = [ 29 28 "E2BFF19637FDC25A02F45583176FAD1ED1F6BDD6" ··· 32 31 }; 33 32 34 33 systemd.user.services.gpg-agent.Service.Slice = "session.slice"; 35 35 - 36 36 - # See: https://github.com/nix-community/home-manager/pull/5901 37 37 - programs.zsh.initContent = let 38 38 - gpgPkg = config.programs.gpg.package; 39 39 - in optionalString helpers.isDarwin '' 40 40 - ${gpgPkg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null 2>&1 41 41 - export SSH_AUTH_SOCK=$(${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket) 42 42 - ''; 43 34 44 35 modules.git.signingKey = mkDefault "303B6A9A312AA035"; 45 36

+1 -3

lib/system.nix

reviewed

··· 10 10 lib = (import nixpkgs { inherit overlays system; }).lib; 11 11 12 12 age = { 13 13 - identityPaths = let 14 14 - identityPath = if isDarwin then "/usr/local/persistent/agenix" else "/var/lib/persistent/agenix"; 15 15 - in [ identityPath ]; 13 13 + identityPaths = [ "/usr/local/persistent/agenix" "/var/lib/persistent/agenix" ]; 16 14 }; 17 15 18 16 systemModules = modules ++ [