From 9dbf58c1b7000c63c22a35c94dd28fc447b6eafe Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 18:54:34 +0100
Subject: [PATCH] Move gnupg configuration

---
 modules/home-manager/default.nix |  1 -
 modules/home-manager/gnupg.nix   |  8 --------
 modules/nixos/default.nix        |  1 -
 modules/nixos/gnupg.nix          | 14 --------------
 modules2/gnupg.nix               | 23 +++++++++++++++++++++++
 5 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 modules/home-manager/gnupg.nix
 delete mode 100644 modules/nixos/gnupg.nix
 create mode 100644 modules2/gnupg.nix

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 5d4b558e..67ff3031 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -8,7 +8,6 @@
     ./dev-commit.nix
     ./direnv.nix
     ./flameshot.nix
-    ./gnupg.nix
     ./gtk.nix
     ./media/handbrake.nix
     ./media/mpv.nix
diff --git a/modules/home-manager/gnupg.nix b/modules/home-manager/gnupg.nix
deleted file mode 100644
index 84735d28..00000000
--- a/modules/home-manager/gnupg.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  home.file.".gnupg/gpg-agent.conf".text = ''
-    allow-preset-passphrase
-    default-cache-ttl 600
-    max-cache-ttl 7200
-    enable-ssh-support
-  '';
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f50ffea5..708f6c08 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,7 +3,6 @@
     ./avahi.nix
     ./dwm
     ./gitea-actions-runner.nix
-    ./gnupg.nix
     ./nixpad
     ./podman.nix
   ];
diff --git a/modules/nixos/gnupg.nix b/modules/nixos/gnupg.nix
deleted file mode 100644
index 6e918951..00000000
--- a/modules/nixos/gnupg.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  security.pam.services.login.gnupg.enable = true;
-
-  programs = {
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-
-      pinentryPackage = pkgs.pinentry-qt;
-    };
-  };
-}
diff --git a/modules2/gnupg.nix b/modules2/gnupg.nix
new file mode 100644
index 00000000..da3edb80
--- /dev/null
+++ b/modules2/gnupg.nix
@@ -0,0 +1,23 @@
+{
+  flake.modules = {
+    nixos.pc =
+      { pkgs, ... }:
+      {
+        security.pam.services.login.gnupg.enable = true;
+
+        programs.gnupg.agent = {
+          enable = true;
+          enableSSHSupport = true;
+
+          pinentryPackage = pkgs.pinentry-qt;
+        };
+      };
+
+    homeManager.base.home.file.".gnupg/gpg-agent.conf".text = ''
+      allow-preset-passphrase
+      default-cache-ttl 600
+      max-cache-ttl 7200
+      enable-ssh-support
+    '';
+  };
+}