fix gpg-agent and cleanup a few things

1 files changed, 11 insertions, 3 deletions

diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index 0cf093c..a2f5c15 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -7,22 +7,30 @@
 		if config.sys.gui.enable
 		then with pkgs; [firefox]
 		else [];
+
+	pinentry =
+		if config.sys.desktop == "gnome"
+		then pkgs.pinentry-gnome
+		else pkgs.pinentry-curses;
 in {
 	environment.systemPackages = with pkgs;
 		[
 			git
 			neofetch
-			pinentry-curses
 			python310
 			vim
 		]
-		++ extraPkgs;
+		++ extraPkgs
+		++ [pinentry];
 
 	programs = {
 		gnupg = {
 			agent = {
 				enable = true;
-				pinentryFlavor = "curses";
+				pinentryFlavor =
+					if config.sys.desktop == "gnome"
+					then "gnome3"
+					else "curses";
 			};
 		};
 	};