diff --git a/modules/system/common.nix b/modules/system/common.nix
index 2aa17ab..72c39a6 100644
--- a/modules/system/common.nix
+++ b/modules/system/common.nix
@@ -21,6 +21,14 @@
 
   nixpkgs.config.allowUnfree = true;
 
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  services.pcscd.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -32,6 +40,8 @@
     lldb
     gammaray # QT Inspector
 
+    yubikey-manager
+
     # Usefull for automatic informations collect software like KDE
     vulkan-tools # For vulkaninfo command
     wayland-utils # For wayland-info command