From a47b9bb1187b17b648fa1299f9b93dbd043d72f7 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Tue, 15 Apr 2025 23:15:32 +0200
Subject: [PATCH] Moved gpg config, added programs.gpg

---
 shared/home-manager/gpg.nix         | 1 +
 shared/modules/security/default.nix | 2 ++
 shared/modules/security/yubikey.nix | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared/home-manager/gpg.nix b/shared/home-manager/gpg.nix
index 1d2038c..6d4b71c 100644
--- a/shared/home-manager/gpg.nix
+++ b/shared/home-manager/gpg.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  programs.gpg.enable = true;
   services.gpg-agent = {
     enable = true;
     enableFishIntegration = true;
diff --git a/shared/modules/security/default.nix b/shared/modules/security/default.nix
index 4fdd9fd..8bb4925 100644
--- a/shared/modules/security/default.nix
+++ b/shared/modules/security/default.nix
@@ -2,4 +2,6 @@
   imports = [
     ./yubikey.nix
   ];
+
+  programs.gnupg.agent.enable = true;
 }
diff --git a/shared/modules/security/yubikey.nix b/shared/modules/security/yubikey.nix
index 900d5b4..20b5952 100644
--- a/shared/modules/security/yubikey.nix
+++ b/shared/modules/security/yubikey.nix
@@ -7,8 +7,6 @@
     yubioath-flutter # GUI
   ];
 
-  programs.gnupg.agent.enable = true;
-
   security = {
     pam = {
       services = {