From cdd746be2c2910c6368f9992fbbfa9028d304b4a Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sun, 5 May 2024 08:30:33 +0900
Subject: [PATCH] Update

---
 home-manager/common/software/cli/gpg.nix   | 7 -------
 nixos/common/desktops/hyprland/default.nix | 2 +-
 nixos/common/services/gnupg-agent.nix      | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/home-manager/common/software/cli/gpg.nix b/home-manager/common/software/cli/gpg.nix
index 6d9dba77..76664a1a 100644
--- a/home-manager/common/software/cli/gpg.nix
+++ b/home-manager/common/software/cli/gpg.nix
@@ -1,11 +1,4 @@
 { ... }: {
-  services.gnupg-agent = {
-    enable = true;
-    enableExtraSocket = true;
-    enableSSHSupport = true;
-    pinentryFlavor = "curses";
-  };
-
   programs.gpg = {
     enable = true;
     settings = {
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 8c24aef4..2b32bf1a 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -135,7 +135,7 @@
     pkgs.rofi-rbw-wayland     # Front-end for Bitwarden with Rofi
 
     # wayland-packages
-    inputs.nixpkgs-wayland.packages.${system}.wayprompt  # from nixpkgs-wayland exclusively - pinentry UI
+    # inputs.nixpkgs-wayland.packages.${system}.wayprompt  # from nixpkgs-wayland exclusively - pinentry UI
   ];
 
   # Enable sound with pipewire.
diff --git a/nixos/common/services/gnupg-agent.nix b/nixos/common/services/gnupg-agent.nix
index 22388299..8f3ed197 100644
--- a/nixos/common/services/gnupg-agent.nix
+++ b/nixos/common/services/gnupg-agent.nix
@@ -6,6 +6,7 @@
     enableSSHSupport = false;
     enableBrowserSocket = true;
     enableExtraSocket = true;
+    pinentryFlavor = "curses";
   };
 
   environment.systemPackages = with pkgs; [