diff --git a/modules/default.nix b/modules/default.nix
index cc440ad..bb133f3 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -22,6 +22,7 @@ in {
     ./utils
     ./vm
     ./website
+    ./yubikey
   ];
 
   documentation.nixos.enable = false;
diff --git a/modules/yubikey/default.nix b/modules/yubikey/default.nix
new file mode 100644
index 0000000..479b475
--- /dev/null
+++ b/modules/yubikey/default.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+  inherit (config) conf;
+in
+  mkIf conf.yuibkey.enable {
+  }
diff --git a/options.nix b/options.nix
index 223d970..4d6bf95 100644
--- a/options.nix
+++ b/options.nix
@@ -14,6 +14,7 @@ in {
       extraLayout.enable = mkEnableOption "Enable additional custom layout.";
       fonts.enable = mkEnableOption "Install and set preferred fonts";
       networkmanager.enable = mkEnableOption "Enable network manager and some related configuration";
+      yubikey.enable = mkEnableOption "Enable support for yubikey";
 
       # Generally server options
       ssh.enable = mkEnableOption "Install my public key to allow accessing this machine via ssh.";