From 41aa7cc366d2242c0dbf1e035f22e7118e2ca942 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 5 Jun 2024 14:22:28 +0200
Subject: overhaul gnupg/trezor setup

---
 user/settings/base.nix           |  1 -
 user/settings/gnupg.nix          | 16 +++++++++++++---
 user/settings/trezor.nix         | 10 ----------
 user/settings/user-interface.nix |  1 +
 4 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 user/settings/trezor.nix

(limited to 'user/settings')

diff --git a/user/settings/base.nix b/user/settings/base.nix
index 63780883..30d21aa9 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -27,7 +27,6 @@ args@{ config
       EMAIL = "alan@alanpearce.eu";
       MANPAGER = "bat -l man -p";
       ABDUCO_SOCKET_DIR = "${state}/abduco";
-      GNUPGHOME = "${data}/gnupg";
       SOLARGRAPH_CACHE = "${cache}/solargraph";
       ELECTRUMDIR = "${data}/electrum";
       DOCKER_CONFIG = "${conf}/docker";
diff --git a/user/settings/gnupg.nix b/user/settings/gnupg.nix
index 913b5d27..d719b618 100644
--- a/user/settings/gnupg.nix
+++ b/user/settings/gnupg.nix
@@ -2,8 +2,18 @@
 , pkgs
 , ...
 }: {
-  home.file.".gnupg" = {
-    recursive = true;
-    source = ../gnupg;
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg";
+    settings = {
+      keyserver = "hkps://keys.openpgp.org";
+    };
+  };
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = with pkgs;
+      if stdenv.isDarwin
+      then pinentry_mac
+      else pinentry-qt;
   };
 }
diff --git a/user/settings/trezor.nix b/user/settings/trezor.nix
deleted file mode 100644
index 6996d9b0..00000000
--- a/user/settings/trezor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config
-, pkgs
-, ...
-}: {
-  home.file.".ssh/agent.config" = {
-    text = ''
-      ecdsa-curve-name = ed25519
-    '';
-  };
-}
diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix
index dd02e9b0..df6e3263 100644
--- a/user/settings/user-interface.nix
+++ b/user/settings/user-interface.nix
@@ -51,6 +51,7 @@ in
       mu
       beeper
       kdePackages.neochat
+      kdePackages.kleopatra
     ]);
   services.lorri.enableNotifications = true;
 }
-- 
cgit 1.4.1