From 6b38d682204c94d8401f9ade9c0489ce195fc354 Mon Sep 17 00:00:00 2001
From: Leon Wilzer <git@komu.boo>
Date: Mon, 2 Dec 2024 00:04:24 +0100
Subject: [PATCH] gpg and ssh adjustments

---
 common.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/common.nix b/common.nix
index 4950d6d..c50c7f5 100644
--- a/common.nix
+++ b/common.nix
@@ -429,7 +429,6 @@ in
       gimp # gnu image manipulation program
       p7zip # (7)zip tool
       zip # standard unix zip tool
-      thunderbird # E-Mail & Calendar
       signal-desktop # Signal Desktop Client
       lazygit # Terminal git frontend
       mpv # Video Playback
@@ -540,7 +539,7 @@ in
       ssh =
         let
           sshDir = "${cfg.userHome}/.ssh";
-          startAgent = true;
+          startAgent = false;
         in
         {
           enable = true;
@@ -614,6 +613,14 @@ in
         generateCaches = true;
       };
 
+      thunderbird = {
+        enable = true;
+        profiles.default = {
+          isDefault = true;
+          withExternalGnupg = true;
+        };
+      };
+
       hyprlock.enable = true;
       zed-editor.enable = true;
       # Let Home Manager install and manage itself.
@@ -647,9 +654,21 @@ in
       };
 
       gpg-agent = {
-        enable = false;
+        enable = true;
         enableSshSupport = false;
+        pinentryPackage = pkgs.pinentry-all;
       };
+
+      gnome-keyring = {
+        enable = true;
+        components = [
+          "pkcs11"
+          "secrets"
+          "ssh"
+        ];
+      };
+
+      ssh-agent.enable = false;
     };
     dconf.settings = {
       "org/virt-manager/virt-manager/connections" = {