From 455b8544d9256fc4ab4e0f384d71142c9726c813 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 28 Mar 2024 19:01:54 +0100 Subject: [PATCH] gpg-agent: migrate to 'pinentryPackage' See: https://github.com/nix-community/home-manager/commit/01e4a5143e92251272850a8e0fbb4518bd099087 --- home.nix | 2 +- home/services.nix | 3 ++- home/services/gpg-agent.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home.nix b/home.nix index c0f131d..1d33ef8 100644 --- a/home.nix +++ b/home.nix @@ -79,7 +79,7 @@ in { }; services = import ./home/services.nix { - inherit config ownLib; + inherit config ownLib pkgs; }; systemd.user = import ./home/systemd.nix { diff --git a/home/services.nix b/home/services.nix index 6d4df14..0f3fe72 100644 --- a/home/services.nix +++ b/home/services.nix @@ -1,4 +1,4 @@ -{ config, ownLib }: +{ config, ownLib, pkgs }: { @@ -7,6 +7,7 @@ }; gpg-agent = import ./services/gpg-agent.nix { + inherit pkgs; }; vdirsyncer = { diff --git a/home/services/gpg-agent.nix b/home/services/gpg-agent.nix index 9ccf0df..d039a79 100644 --- a/home/services/gpg-agent.nix +++ b/home/services/gpg-agent.nix @@ -1,9 +1,9 @@ -_: +{ pkgs }: { enable = true; defaultCacheTtl = 3600; maxCacheTtl = 36000; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }