about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2024-03-18 11:08:52 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2024-03-18 11:22:48 +0100
commit124ec2d9d65e19297a3f1fbd298288a022e2267a (patch)
treeadab361b93bc5a0f2b70920f281fe187601a207d
parenta526f9bb5de3424d12156ae9540e6f1dc1a31a8c (diff)
downloadnixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar.gz
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar.bz2
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar.lz
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar.xz
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.tar.zst
nixlib-124ec2d9d65e19297a3f1fbd298288a022e2267a.zip
nixos/xserver: don't conflict pinentry package with DEs
-rw-r--r--nixos/modules/services/x11/xserver.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3d7474e18263..4e0235f9ad1d 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -749,7 +749,7 @@ in
     boot.kernel.sysctl."fs.inotify.max_user_instances" = mkDefault 524288;
     boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288;
 
-    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;
+    programs.gnupg.agent.pinentryPackage = lib.mkOverride 1100 pkgs.pinentry-gnome3;
 
     systemd.defaultUnit = mkIf cfg.autorun "graphical.target";