From e9fddc2e9c8c2620c7ccd4176966b646c60c7458 Mon Sep 17 00:00:00 2001
From: Pedro Rey Anca <personal@peprolinbot.com>
Date: Fri, 30 Aug 2024 14:26:57 +0200
Subject: [PATCH] Switch gpg-agent config to home-manager

---
 modules/core/programs.nix | 10 ----------
 modules/home/default.nix  |  1 +
 modules/home/gpg.nix      |  7 +++++++
 3 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 modules/home/gpg.nix

diff --git a/modules/core/programs.nix b/modules/core/programs.nix
index cea015e..3db60c4 100644
--- a/modules/core/programs.nix
+++ b/modules/core/programs.nix
@@ -6,16 +6,6 @@
   programs.dconf.enable = true;
   programs.zsh.enable = true;
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    # pinentryFlavor = "";
-  };
-  environment.shellInit = ''
-    gpg-connect-agent /bye
-    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-  '';
-
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [];
   programs.adb.enable = true;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 9a2ce67..3e2ebac 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -9,6 +9,7 @@
     ++ [(import ./btop.nix)] # resouces monitor
     ++ [(import ./cava.nix)] # audio visualizer
     ++ [(import ./discord.nix)] # discord with catppuccin theme
+    ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent)
     ++ [(import ./floorp/floorp.nix)] # firefox based browser
     ++ [(import ./fuzzel.nix)] # launcher
     ++ [(import ./gaming.nix)] # packages related to gaming
diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix
new file mode 100644
index 0000000..2dfe2fb
--- /dev/null
+++ b/modules/home/gpg.nix
@@ -0,0 +1,7 @@
+{...}: {
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"];
+  };
+}