From 006c0cc4659e20e47541657bbd192492c6461aa2 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 8 Jun 2019 20:12:46 +0200
Subject: Separate GnuPG, Keybase and Tor

---
 modules/programs/gnupg.nix | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

(limited to 'modules/programs/gnupg.nix')

diff --git a/modules/programs/gnupg.nix b/modules/programs/gnupg.nix
index af50078..663bcb3 100644
--- a/modules/programs/gnupg.nix
+++ b/modules/programs/gnupg.nix
@@ -1,40 +1,10 @@
 { config, pkgs, lib, ... }:
 
-{ programs.ssh.startAgent = false;
-
-  programs.gnupg = {
-    agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    dirmngr.enable = true;
-  };
-
-  services.keybase.enable = true;
-  services.kbfs.enable = true;
-  environment.variables.NIX_SKIP_KEYBASE_CHECKS = "1";
-
-  services.tor = {
-    enable = true;
-    client = {
-      enable = true;
-      socksListenAddress = "9050 IPv6Traffic";
-    };
-    torsocks = {
-      enable = true;
-    };
-  };
-  systemd.services.tor.wantedBy = lib.mkForce [];
-  systemd.timers.tor = {
-    description = "Delayed startup of Tor";
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnActiveSec = "1 min";
-    };
-  };
-
+{
   environment.systemPackages = with pkgs; [
     gnupg
-    keybase-gui
+    pinentry
+    (python3.withPackages(ps: with ps; [ trezor_agent wheel ]))
   ];
+  environment.variables.GNUPGHOME = "$HOME/.gnupg/trezor/";
 }
-- 
cgit 1.4.1