From b8f11db00e56bdbe72d28227c389a09e486f2217 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 23 May 2019 10:54:02 +0200
Subject: Split nitrokey and GnuPG setup

---
 modules/hardware/nitrokey.nix | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

(limited to 'modules/hardware')

diff --git a/modules/hardware/nitrokey.nix b/modules/hardware/nitrokey.nix
index 3837f6f3..a77ce00c 100644
--- a/modules/hardware/nitrokey.nix
+++ b/modules/hardware/nitrokey.nix
@@ -1,46 +1,13 @@
 { config, pkgs, lib, ... }:
 
-{ programs.ssh.startAgent = false;
-
-  programs.gnupg = {
-    agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    dirmngr.enable = true;
-  };
-
+{
   hardware.nitrokey = {
     enable = true;
   };
 
   services.pcscd.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
     nitrokey-app
-    keybase-gui
   ];
 }
-- 
cgit 1.4.1