From efe1a358dcdfde29079ecc8bc9053df4faad7ffc Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Thu, 9 May 2024 22:05:35 +0200
Subject: fix(hm/conf/gpg): Remove `onlykey` specific configuration

---
 hm/soispha/conf/gpg/default.nix | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

(limited to 'hm/soispha/conf/gpg')

diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix
index 4926e55b..ffc90ffe 100644
--- a/hm/soispha/conf/gpg/default.nix
+++ b/hm/soispha/conf/gpg/default.nix
@@ -1,34 +1,10 @@
 {
   config,
-  nixosConfig,
-  sysLib,
   pkgs,
-  nixpkgs_open_prs,
-  system,
   ...
 }: let
-  pkgs_onlykey = nixpkgs_open_prs.nixpkgs-onlykey.legacyPackages."${system}";
-  agent-program = sysLib.writeShellScript {
-    name = "onlykey-gpg-agent";
-    src = ./agent-program.sh;
-    dependencies = [
-      pkgs.python3
-      pkgs_onlykey.onlykey-agent
-    ];
-  };
-
-  settings =
-    if nixosConfig.networking.hostName == "isimud"
-    then {}
-    else {
-      # Hardware-based GPG configuration
-      agent-program = "${agent-program}/bin/onlykey-gpg-agent";
-
-      default-key = "Soispha <soispha@vhack.eu>";
-      # TODO: add more
-    };
   gpg-agent = {
-    enable = nixosConfig.networking.hostName == "isimud";
+    enable = true;
     enableZshIntegration = true;
     enableScDaemon = true; # smartcards and such things
     pinentryPackage = pkgs.pinentry-tty;
@@ -39,7 +15,12 @@ in {
     homedir = "${config.xdg.dataHome}/gnupg/onlykey";
     mutableKeys = false;
     mutableTrust = false;
-    inherit settings;
+
+    settings = {
+      default-key = "Benedikt Peetz <benedikt.peetz@b-peetz.de>";
+      # TODO: add more
+    };
+
     publicKeys = [
       {
         source = ./keys/key_1;
-- 
cgit 1.4.1