diff --git a/features-nixos/optional/solokey.nix b/features-nixos/optional/solokey.nix
new file mode 100644
index 0000000..1d49a02
--- /dev/null
+++ b/features-nixos/optional/solokey.nix
@@ -0,0 +1,7 @@
+# config to make solokey1 work for ssh
+{...}: {
+  # services.pcscd.enable = true;
+
+  services.gnome.gcr-ssh-agent.enable = false;
+  programs.ssh.startAgent = true;
+}
diff --git a/hosts/aspi/default.nix b/hosts/aspi/default.nix
index 0befe33..5a64010 100644
--- a/hosts/aspi/default.nix
+++ b/hosts/aspi/default.nix
@@ -24,6 +24,7 @@
     "${pwd}/features-nixos/optional/k9s"
 
     "${pwd}/features-nixos/optional/avahi.nix"
+    "${pwd}/features-nixos/optional/solokey.nix"
   ];
 
   networking.hostName = "aspi";
diff --git a/hosts/kardorf/default.nix b/hosts/kardorf/default.nix
index 0252708..91030f1 100644
--- a/hosts/kardorf/default.nix
+++ b/hosts/kardorf/default.nix
@@ -27,6 +27,7 @@
     "${pwd}/features-nixos/optional/wireshark.nix"
     "${pwd}/features-nixos/optional/flatpak.nix"
     "${pwd}/features-nixos/optional/k9s"
+    "${pwd}/features-nixos/optional/solokey.nix"
   ];
 
   networking.hostName = "kardorf";