From 3737018d07f5f977c8c9412343ed4fae84dc014b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 6 Nov 2023 11:13:49 +0100
Subject: kusanagi: better gpg config

---
 nixpkgs/kusanagi.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'nixpkgs')

diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 17333fe..fc6827d 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -18,10 +18,6 @@ in {
     mklink /Z/lx/Downloads ~/Downloads
 
     mklink /Z/lx/app/openssh ~/.ssh
-    mkdir -p ~/.gnupg
-    mklink /Z/lx/app/gnupg/pubring.kbx ~/.gnupg/pubring.kbx
-    mklink /Z/lx/app/gnupg/trustdb.gpg ~/.gnupg/trustdb.gpg
-    mklink /Z/lx/app/gnupg/private-keys-v1.d ~/.gnupg/private-keys-v1.d
     mklink /Z/lx/app/cargo ~/.cargo
 
     mklink /Z/lx/app/arduino/Arduino ~/Arduino
@@ -69,10 +65,16 @@ in {
 
   gtk.gtk3.bookmarks = [ "file:///Z/lx" ];
 
-  services.gpg-agent.enable = true;
-  services.gpg-agent.enableSshSupport = false;
-  services.gpg-agent.pinentryFlavor = "qt";
-  services.gpg-agent.extraConfig = "no-allow-external-cache";
+  programs.gpg = {
+    enable = true;
+    homedir = "/Z/lx/app/gnupg";
+  };
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = false;
+    pinentryFlavor = "qt";
+    extraConfig = "no-allow-external-cache";
+  };
 
   programs.keychain = {
     enable = true;
-- 
cgit v1.2.3