aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMx Kookie <kookie@spacekookie.de>2020-12-23 16:42:57 +0100
committerMx Kookie <kookie@spacekookie.de>2020-12-23 16:42:57 +0100
commitb86ac7608685da287727bc8490d5507de16827e8 (patch)
treeca66649e0d3a843d441ce68df6cbae7a98180f55
parent4e0569277441d57b68fb107b3372ae3206fa5644 (diff)
libkookie: gpg: implement gpg and yubikey handling
-rw-r--r--infra/libkookie/configuration/workstation/gpg/default.nix2
-rw-r--r--infra/libkookie/configuration/workstation/yubikey/default.nix15
-rw-r--r--infra/libkookie/roots/tempest.nix3
3 files changed, 19 insertions, 1 deletions
diff --git a/infra/libkookie/configuration/workstation/gpg/default.nix b/infra/libkookie/configuration/workstation/gpg/default.nix
index cb7d0eb4d914..a08b73a20d98 100644
--- a/infra/libkookie/configuration/workstation/gpg/default.nix
+++ b/infra/libkookie/configuration/workstation/gpg/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, home-manager, ... }:
{
programs.gnupg.agent = {
diff --git a/infra/libkookie/configuration/workstation/yubikey/default.nix b/infra/libkookie/configuration/workstation/yubikey/default.nix
new file mode 100644
index 000000000000..f139e3395e06
--- /dev/null
+++ b/infra/libkookie/configuration/workstation/yubikey/default.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+with pkgs;
+{
+ services.udev.packages = [ yubikey-personalization ];
+
+ # Sometimes this is needed, so we keep it here
+ # services.pcscd.enable = true;
+
+ # FIXME: Can I remove these?
+ # Previously these rules were required to make
+ # Yubikey support work on `uwu`, but maybe this
+ # is redundant with special udev rules?
+ environment.systemPackages = [ yubikey-manager yubikey-personalization ];
+}
diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index e7d86e284590..dce777eedaf2 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -33,6 +33,9 @@ in
<configuration/workstation/xkblayout>
+ <configuration/workstation/yubikey>
+ <configuration/workstation/gpg>
+
#################################################################
# home-manager modules that exist entirely in userspace