From 4fe17e1ec049eecaa26fe4c4cbe72bac10fbb440 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 16 Mar 2025 14:02:51 +0000
Subject: [PATCH] gpg: move from module to user config

---
 hosts/atlas/default.nix               |  1 -
 hosts/eos/default.nix                 |  1 -
 hosts/helios/default.nix              |  1 -
 hosts/hypnos/default.nix              |  1 -
 hosts/library/default.nix             |  1 -
 hosts/odyssey/default.nix             |  1 -
 modules/home-manager/default.nix      |  1 -
 modules/home-manager/programs/gpg.nix | 28 ---------------------------
 users/jordan/default.nix              |  1 +
 users/jordan/gpg.nix                  | 14 ++++++++++++++
 10 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 modules/home-manager/programs/gpg.nix
 create mode 100644 users/jordan/gpg.nix

diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index 0e8b8c4..7b88e0d 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -24,7 +24,6 @@
   modules = {
     programs = {
       firefox.enable = true;
-      gpg.enable = true;
       graphics = {
         raster.enable = true;
         vector.enable = true;
diff --git a/hosts/eos/default.nix b/hosts/eos/default.nix
index 22a7e94..3c1d797 100644
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@@ -27,7 +27,6 @@
   modules = {
     programs = {
       firefox.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
       pass.enable = true;
       qbittorrent.enable = true;
diff --git a/hosts/helios/default.nix b/hosts/helios/default.nix
index eadd192..bb169fb 100644
--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@@ -28,7 +28,6 @@
   modules = {
     programs = {
       firefox.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
       pass.enable = true;
       qbittorrent.enable = true;
diff --git a/hosts/hypnos/default.nix b/hosts/hypnos/default.nix
index 682416b..a6c9dcb 100644
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@@ -51,7 +51,6 @@
   modules = {
     programs = {
       firefox.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
       pass.enable = true;
       recording = {
diff --git a/hosts/library/default.nix b/hosts/library/default.nix
index d79c0ca..2e5e43f 100644
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@@ -183,7 +183,6 @@
   modules = {
     podman.enable = true;
     programs = {
-      gpg.enable = true;
     };
     services = {
       borgmatic = {
diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix
index 9c927a2..a63a820 100644
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -62,7 +62,6 @@
         xbox.enable = true;
       };
       firefox.enable = true;
-      gpg.enable = true;
       graphics = {
         modeling.enable = true;
         raster.enable = true;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 4874bfd..40a7863 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -5,7 +5,6 @@
     ./programs/emulators.nix
     ./programs/firefox.nix
     ./programs/forensics.nix
-    ./programs/gpg.nix
     ./programs/graphics.nix
     ./programs/libreoffice.nix
     ./programs/lutris.nix
diff --git a/modules/home-manager/programs/gpg.nix b/modules/home-manager/programs/gpg.nix
deleted file mode 100644
index c540908..0000000
--- a/modules/home-manager/programs/gpg.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.gpg;
-in
-{
-  options.modules.programs.gpg = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.programs.gpg = {
-      enable = true;
-    };
-
-    home.services.gpg-agent = {
-      enable = true;
-      enableSshSupport = true;
-    };
-  };
-}
diff --git a/users/jordan/default.nix b/users/jordan/default.nix
index 15f4900..9fb8537 100644
--- a/users/jordan/default.nix
+++ b/users/jordan/default.nix
@@ -32,6 +32,7 @@ in
   home-manager.users.${name} = {
     imports = [
       ./git.nix
+      ./gpg.nix
       ./shell.nix
     ];
 
diff --git a/users/jordan/gpg.nix b/users/jordan/gpg.nix
new file mode 100644
index 0000000..57724ea
--- /dev/null
+++ b/users/jordan/gpg.nix
@@ -0,0 +1,14 @@
+{
+  ...
+}:
+
+{
+  home.programs.gpg = {
+    enable = true;
+  };
+
+  home.services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
+}