diff --git a/configs/client.nix b/configs/client.nix
index aac728c..ee49815 100644
--- a/configs/client.nix
+++ b/configs/client.nix
@@ -7,6 +7,12 @@
     fastfetch
   ];
 
+  hm.programs.keychain = {
+    enable = true;
+    agents = ["ssh"];
+    keys = ["id_ed25519"];
+  };
+
   networking = {
     useNetworkd = false;
     networkmanager = {
diff --git a/configs/common.nix b/configs/common.nix
index ac20d8e..b6cf185 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -75,8 +75,6 @@ in {
       addKeysToAgent = "yes";
       forwardAgent = true;
     };
-
-    services.ssh-agent.enable = true;
   };
 
   home-manager = {
diff --git a/programs/fish.nix b/programs/fish.nix
index e01b758..b4bec2e 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -10,13 +10,9 @@
   hm.programs.fish = {
     enable = true;
 
-    interactiveShellInit = with pkgs; ''
-      if test -f ~/.ssh/id_ed25519
-        ssh-add -l | grep -q (ssh-keygen -lf ~/.ssh/id_ed25519) || ssh-add ~/.ssh/id_ed25519
-      end
-
-      ${lib.getExe starship} init fish | source
-      ${lib.getExe nix-your-shell} fish | source
+    interactiveShellInit = ''
+      ${lib.getExe pkgs.starship} init fish | source
+      ${lib.getExe pkgs.nix-your-shell} fish | source
     '';
 
     functions.fish_greeting = "";
diff --git a/programs/kde.nix b/programs/kde.nix
index 2dd6196..69f0ff8 100644
--- a/programs/kde.nix
+++ b/programs/kde.nix
@@ -12,8 +12,6 @@
   };
 
   environment = {
-    variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";
-
     systemPackages = with pkgs; [
       flameshot
       gnome-calculator