diff --git a/extra/yubikey.nix b/extra/yubikey.nix
new file mode 100644
index 0000000..c087829
--- /dev/null
+++ b/extra/yubikey.nix
@@ -0,0 +1,12 @@
+{ pkgs, config, ... }: {
+
+    services.pcscd.enable = true; # enable support for smart cards
+
+    environment.systemPackages = with pkgs; [
+        # Yubikey stuff
+        yubioath-flutter    # Yubico authentictor app for managing accounts
+        yubikey-manager     # CLI tool for ykman
+        yubikey-manager-qt  # GUI tool for ykman
+        pcsclite
+    ];
+}
diff --git a/users/servostar/user.nix b/users/servostar/user.nix
index f7bf24a..4399a1a 100644
--- a/users/servostar/user.nix
+++ b/users/servostar/user.nix
@@ -9,8 +9,6 @@
   #
   # Configuration for user servostar
 
-  services.pcscd.enable = true; # enable support for smart cards
-
   services.printing.enable = true;
   services.avahi.enable = true;
   # for a WiFi printer
@@ -133,12 +131,6 @@
       tor
       xournalpp
 
-      # Yubikey stuff
-      yubioath-flutter    # Yubico authentictor app for managing accounts
-      yubikey-manager     # CLI tool for ykman
-      yubikey-manager-qt  # GUI tool for ykman
-      pcsclite
-
       jetbrains-toolbox
    ];
   };