chore: move gpg-related settings to base

2 files changed, 12 insertions, 7 deletions

diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index 9c97d5f..5e5cbcb 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -81,6 +81,8 @@ in
       # Normal
       pkgs.bottom
       pkgs.fd
+      # Fix gpg not recognizing foot terminfo
+      pkgs.foot.terminfo
       pkgs.fzf
       pkgs.hydra-check
       pkgs.libnotify
@@ -115,6 +117,7 @@ in
       direnv.nix-direnv.enable = true;
       exa.enable = true;
       exa.enableAliases = true;
+      gpg.enable = true;
       home-manager.enable = true;
       htop.enable = true;
 
@@ -239,6 +242,15 @@ in
         settings = import ./config/dunst.nix { inherit neotheme; };
       };
 
+      gpg-agent = {
+        enable = true;
+        pinentryFlavor = "gtk2";
+        defaultCacheTtl = 3600;
+        defaultCacheTtlSsh = 3600;
+        maxCacheTtl = 86400;
+        maxCacheTtlSsh = 86400;
+      };
+
       swayidle = {
         enable = true;
         events = [
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index c8366ae..7dc855b 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -10,7 +10,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    programs.gpg.enable = true;
     programs.git = {
       enable = true;
       package = pkgs.gitFull;
@@ -70,8 +69,6 @@ in
       pkgs.bfg-repo-cleaner
       pkgs.diffoscopeMinimal
       pkgs.du-dust
-      # Fix gpg not recognizing foot terminfo
-      pkgs.foot.terminfo
       # TODO: https://github.com/cli/cli/issues/4955
       pkgs.gh
       pkgs.go
@@ -88,10 +85,6 @@ in
       pkgs.xh
     ];
 
-    services.gpg-agent = {
-      enable = true;
-      pinentryFlavor = "curses";
-    };
   };
 }