From 6883541678871a94c3c7d9144dfedf166b37e436 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Fri, 29 Aug 2025 13:54:07 +0000
Subject: [PATCH] Update gpg pinentry

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../common/configs/user/console/gpg-agent/default.nix  |  1 +
 hosts/common/configs/user/gui/vscode/default.nix       |  2 ++
 .../elara/users/nikara/configs/console/gpg/default.nix |  3 ---
 overlays/default.nix                                   |  4 ++++
 packages/default.nix                                   |  4 ++++
 packages/vscode/extensions/gpg-indicator/default.nix   | 10 ++++++++++
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 packages/vscode/extensions/gpg-indicator/default.nix

diff --git a/hosts/common/configs/user/console/gpg-agent/default.nix b/hosts/common/configs/user/console/gpg-agent/default.nix
index 00c7497..abbc00a 100644
--- a/hosts/common/configs/user/console/gpg-agent/default.nix
+++ b/hosts/common/configs/user/console/gpg-agent/default.nix
@@ -20,6 +20,7 @@
       enable = true;
       defaultCacheTtl = 31536000;
       maxCacheTtl = 31536000;
+      pinentry.package = pkgs.pinentry-tty;
     };
 
     systemd.user = {
diff --git a/hosts/common/configs/user/gui/vscode/default.nix b/hosts/common/configs/user/gui/vscode/default.nix
index b17af93..be9ff0b 100644
--- a/hosts/common/configs/user/gui/vscode/default.nix
+++ b/hosts/common/configs/user/gui/vscode/default.nix
@@ -25,6 +25,8 @@ in
           ms-vsliveshare.vsliveshare
           ms-vscode-remote.remote-ssh
           naumovs.color-highlight
+          # FIXME: https://github.com/microsoft/vscode/issues/130415
+          wdhongtw.gpg-indicator
         ];
 
         userSettings = {
diff --git a/hosts/elara/users/nikara/configs/console/gpg/default.nix b/hosts/elara/users/nikara/configs/console/gpg/default.nix
index 72b5c28..28fcffa 100644
--- a/hosts/elara/users/nikara/configs/console/gpg/default.nix
+++ b/hosts/elara/users/nikara/configs/console/gpg/default.nix
@@ -36,8 +36,5 @@ in
       "Personal GPG Passphrase".source = hmConfig.sops.secrets."gpg/personal/pass".path;
       "SAS GPG Passphrase".source = hmConfig.sops.secrets."gpg/sas/pass".path;
     };
-
-    home.packages = [ pkgs.gcr ];
-    services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
   };
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index 2002471..f4b1766 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -86,6 +86,10 @@ final: prev:
     gitlab = final.ssh-known-hosts-gitlab;
   };
 
+  vscode-extensions = prev.vscode-extensions or { } // {
+    wdhongtw.gpg-indicator = final.vscode-extension-wdhongtw-gpg-indicator;
+  };
+
   yaziPlugins = prev.yaziPlugins or { } // {
     custom-shell = final.yazi-plugin-custom-shell;
   };
diff --git a/packages/default.nix b/packages/default.nix
index 03343a9..73c4f7f 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -89,6 +89,10 @@
   ssh-known-hosts-github = import ./ssh/known-hosts/github { inherit pkgs; };
   ssh-known-hosts-gitlab = import ./ssh/known-hosts/gitlab { inherit pkgs; };
 
+  vscode-extension-wdhongtw-gpg-indicator = import ./vscode/extensions/gpg-indicator {
+    inherit pkgs;
+  };
+
   wsl-wl-clipboard = import ./wsl-wl-clipboard { inherit pkgs; };
 
   yazi-plugin-custom-shell = import ./yazi/plugins/custom-shell { inherit pkgs; };
diff --git a/packages/vscode/extensions/gpg-indicator/default.nix b/packages/vscode/extensions/gpg-indicator/default.nix
new file mode 100644
index 0000000..2878358
--- /dev/null
+++ b/packages/vscode/extensions/gpg-indicator/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+# AUTO-UPDATE: nix-update --flake vscode-extension-wdhongtw-gpg-indicator
+pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    publisher = "wdhongtw";
+    name = "gpg-indicator";
+    version = "0.7.5";
+    hash = "sha256-gRwpU/KQj/5eYIJe6BORERIkiLV8Chz7+gJMqb08+J0=";
+  };
+}