From 470983b32e86fcbe8d9be3851285ab13e876e822 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 17 Oct 2022 15:58:13 +0200
Subject: [PATCH] Use gnome-keyring more...

---
 home/fish/fish.nix              | 3 +++
 home/macbook-nixos.nix          | 2 +-
 kagami-air-m1/configuration.nix | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/home/fish/fish.nix b/home/fish/fish.nix
index b9d8760..f415399 100644
--- a/home/fish/fish.nix
+++ b/home/fish/fish.nix
@@ -68,6 +68,9 @@
 
       # Set up direnv
       ${pkgs.direnv}/bin/direnv hook fish | source
+
+      # Set up tty for GPG
+      export GPG_TTY=(tty)
     '';
     plugins = [
       {
diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index 8599afb..3033479 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -55,7 +55,7 @@
 
   home.file.".gnupg/gpg-agent.conf" = {
     text = ''
-      pinentry-program ${pkgs.kwalletcli}/bin/pinentry-kwallet
+      pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
     '';
     onChange = ''
       echo "Reloading gpg-agent"
diff --git a/kagami-air-m1/configuration.nix b/kagami-air-m1/configuration.nix
index 8073c9c..19640ec 100644
--- a/kagami-air-m1/configuration.nix
+++ b/kagami-air-m1/configuration.nix
@@ -68,6 +68,7 @@
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.displayManager.sddm.enableHidpi = true;
   services.xserver.desktopManager.plasma5.enable = true;
+  services.gnome.gnome-keyring.enable = true;
 
   services.udev.packages = with pkgs; [ libfido2 ];
 
@@ -176,6 +177,8 @@
     bindPort = 6565;
   };
 
+  services.dbus.packages = with pkgs; [ gcr ];
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];