4 files changed, 39 insertions, 34 deletions
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/";
 }
diff --git a/modules/programs/keybase.nix b/modules/programs/keybase.nix
new file mode 100644
index 0000000..39a16b2
--- /dev/null
+++ b/modules/programs/keybase.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.keybase.enable = true;
+  services.kbfs.enable = true;
+  environment.variables.NIX_SKIP_KEYBASE_CHECKS = "1";
+
+  environment.systemPackages = with pkgs; [
+    keybase-gui
+  ];
+}
diff --git a/modules/programs/tor.nix b/modules/programs/tor.nix
new file mode 100644
index 0000000..5524aed
--- /dev/null
+++ b/modules/programs/tor.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }:
+
+{
+  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";
+    };
+  };
+}
diff --git a/satoshipad.nix b/satoshipad.nix
index 3f21943..11cd3fc 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -25,6 +25,8 @@
     ./modules/programs/accounting.nix
     ./modules/programs/dotfiles.nix
     ./modules/programs/gnupg.nix
+    ./modules/programs/keybase.nix
+    ./modules/programs/tor.nix
     ./modules/programs/i3.nix
     ./modules/programs/infrastructure.nix
     ./modules/programs/passwords.nix