From 0f73f5030938416dc00facd1b3f0772f10ede535 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Tue, 26 Sep 2023 15:56:21 -0400
Subject: [PATCH] home-manager gburd

---
 home-manager/_mixins/cli/gpg.nix         |  9 +++++----
 home-manager/_mixins/console/default.nix | 15 ++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/home-manager/_mixins/cli/gpg.nix b/home-manager/_mixins/cli/gpg.nix
index 7865109..09bf19f 100644
--- a/home-manager/_mixins/cli/gpg.nix
+++ b/home-manager/_mixins/cli/gpg.nix
@@ -10,15 +10,16 @@ let
     };
 in
 {
-  #  home.packages = pinentry.packages;
-  home.packages = [ pkgs.pinentry-curses ];
+  home.packages = pinentry.packages;
+  #  home.packages = [ pkgs.pinentry-curses ];
 
   services.gpg-agent = {
     #TODO: gnupg vs gpg-agent ?
     enable = true;
     enableSshSupport = true;
-    #    sshKeys = [ "149F16412997785363112F3DBD713BC91D51B831" ];
-    pinentryFlavor = pinentry.name;
+    # TODO: sshKeys = [ "149F16412997785363112F3DBD713BC91D51B831" ];
+    # TODO: pinentryFlavor = pinentry.name;
+    pinentryFlavor = "curses";
     enableExtraSocket = true;
   };
 
diff --git a/home-manager/_mixins/console/default.nix b/home-manager/_mixins/console/default.nix
index 55ab36e..cb8d1d1 100644
--- a/home-manager/_mixins/console/default.nix
+++ b/home-manager/_mixins/console/default.nix
@@ -1,15 +1,4 @@
-{ config, lib, pkgs, ... }:
-let
-  pinentry =
-    if config.gtk.enable then {
-      packages = [ pkgs.pinentry-gnome pkgs.gcr ];
-      name = "gnome3";
-    } else {
-      packages = [ pkgs.pinentry-curses ];
-      name = "curses";
-    };
-in
-{
+{ config, lib, pkgs, ... }: {
   home = {
     file = {
       "${config.xdg.configHome}/neofetch/config.conf".text = builtins.readFile ./neofetch.conf;
@@ -176,7 +165,7 @@ in
     gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryFlavor = pinentry.name;
+      pinentryFlavor = "curses";
     };
   };