diff options
| -rw-r--r-- | modules/hardware/nitrokey.nix | 35 | ||||
| -rw-r--r-- | modules/programs/gnupg.nix | 40 | ||||
| -rw-r--r-- | satoshipad.nix | 1 |
3 files changed, 42 insertions, 34 deletions
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 ]; } diff --git a/modules/programs/gnupg.nix b/modules/programs/gnupg.nix new file mode 100644 index 00000000..af500780 --- /dev/null +++ b/modules/programs/gnupg.nix @@ -0,0 +1,40 @@ +{ 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 + ]; +} diff --git a/satoshipad.nix b/satoshipad.nix index 528f20f8..a68848c4 100644 --- a/satoshipad.nix +++ b/satoshipad.nix @@ -25,6 +25,7 @@ ./modules/machines/t470s.nix ./modules/programs/accounting.nix ./modules/programs/dotfiles.nix + ./modules/programs/gnupg.nix ./modules/programs/i3.nix ./modules/programs/infrastructure.nix ./modules/programs/passwords.nix |