From 317a6497d0b1cee2bb7e1b1b344021b3e5164013 Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Sat, 11 Nov 2023 03:43:53 -0800
Subject: [PATCH] Fixes linux gpg-agent

---
 home/darwin/default.nix | 8 ++++++++
 home/default.nix        | 8 --------
 home/linux/services.nix | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/home/darwin/default.nix b/home/darwin/default.nix
index 51809aa..3fb3655 100644
--- a/home/darwin/default.nix
+++ b/home/darwin/default.nix
@@ -20,6 +20,14 @@
 
   programs.ssh.includes = ["/Users/willem/.colima/ssh_config"];
 
+  home.file.".gnupg/gpg-agent.conf" = {
+    text = ''
+      pinentry-program "${pkgs.pinentry.out}/bin/pinentry"
+      default-cache-ttl 30
+      max-cache-ttl 600
+    '';
+  };
+
   programs.zsh.shellAliases = {
     drs = "nix run nix-darwin -- switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
     dbs = "nix run nix-darwin -- build --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
diff --git a/home/default.nix b/home/default.nix
index 654c43c..20e22b8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -38,14 +38,6 @@ in rec {
     };
   };
 
-  home.file.".gnupg/gpg-agent.conf" = {
-    text = ''
-      pinentry-program "${pkgs.pinentry.out}/bin/pinentry"
-      default-cache-ttl 30
-      max-cache-ttl 600
-    '';
-  };
-
   home.file.".config/nixpkgs/config.nix".text = ''
     # -*-nix-*-
     {
diff --git a/home/linux/services.nix b/home/linux/services.nix
index e8f1381..6925bd6 100644
--- a/home/linux/services.nix
+++ b/home/linux/services.nix
@@ -13,7 +13,7 @@
       enableZshIntegration = true;
       defaultCacheTtl = 30;
       maxCacheTtl = 600;
-      pinentryFlavor = "tty";
+      pinentryFlavor = "curses";
     };
 
     emacs = {