modules/nixos: use default gpg pinentry

4 files changed, 2 insertions, 17 deletions

diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix
index 1e409d8..c9758d4 100644
--- a/modules/nixos/base/packages.nix
+++ b/modules/nixos/base/packages.nix
@@ -11,20 +11,12 @@ in {
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      pinentry-curses
       python311
     ];
 
     programs = {
       git.enable = true;
-
-      gnupg = {
-        agent = {
-          enable = true;
-          pinentryFlavor = lib.mkDefault "curses";
-        };
-      };
-
+      gnupg.agent.enable = true;
       vim.defaultEditor = true;
     };
   };
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 2536a55..a0277cc 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -28,7 +28,7 @@ in {
 
     environment = {
       noXlibs = lib.mkForce false;
-      systemPackages = with pkgs; [pinentry-curses wl-clipboard xclip];
+      systemPackages = with pkgs; [wl-clipboard xclip];
     };
 
     programs = {
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index fd3d34d..80a75f0 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -20,8 +20,6 @@ in {
       systemPackages = with pkgs; [
         adw-gtk3
         blackbox-terminal
-        pinentry-gnome
-        pinentry-gnome
       ];
     };
 
@@ -32,7 +30,5 @@ in {
       };
       desktopManager.gnome.enable = true;
     };
-
-    programs.gnupg.agent.pinentryFlavor = "gnome3";
   };
 }
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index f7a8065..500317d 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -13,7 +13,6 @@ in {
     getchoo.desktop.enable = true;
 
     environment = {
-      systemPackages = with pkgs; [pinentry-qt];
       plasma5.excludePackages = with pkgs.libsForQt5; [
         khelpcenter
         plasma-browser-integration
@@ -28,7 +27,5 @@ in {
         useQtScaling = true;
       };
     };
-
-    programs.gnupg.agent.pinentryFlavor = "qt";
   };
 }