diff --git a/hosts/dunamis/programs.nix b/hosts/dunamis/programs.nix
index 8be2b46..7f6aa03 100644
--- a/hosts/dunamis/programs.nix
+++ b/hosts/dunamis/programs.nix
@@ -1,9 +1,8 @@
-{pkgs, ...}: {
-  programs.neovim = {
-    enable = false;
-    viAlias = true;
-    vimAlias = true;
-  };
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nh = {
     enable = true;
     clean.enable = true;
@@ -12,6 +11,7 @@
   };
   programs.fish.enable = true;
   environment.systemPackages = with pkgs; [
+    (lib.hiPrio uutils-coreutils-noprefix)
     helix
     nushell
   ];
diff --git a/hosts/dunamis/sops.nix b/hosts/dunamis/sops.nix
index 4ef8f6a..48d98dd 100644
--- a/hosts/dunamis/sops.nix
+++ b/hosts/dunamis/sops.nix
@@ -14,13 +14,13 @@ in {
     defaultSopsFile = "${secretsPath}/secrets.yaml";
     secrets = {
       "user-password-hashed".neededForUsers = true;
-      "ssh-private-dunamis-user" = {
-        path = "/home/user/.ssh/id_ed25519";
+      "ssh-config" = {
+        path = "/home/user/.ssh/config";
         mode = "0400";
         owner = "user";
       };
-      "ssh-config" = {
-        path = "/home/user/.ssh/config";
+      "ssh-private-dunamis-user" = {
+        path = "/home/user/.ssh/id_ed25519";
         mode = "0400";
         owner = "user";
       };
diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix
index 5e99840..a09dbf0 100644
--- a/hosts/dunamis/users/user/programs.nix
+++ b/hosts/dunamis/users/user/programs.nix
@@ -8,6 +8,7 @@
   console.yazi.enable = true;
 
   stylix.targets.fzf.enable = false;
+  services.ssh-agent.enable = true;
   programs = {
     bat.enable = true;
     btop = {
diff --git a/hosts/eldrid/sops.nix b/hosts/eldrid/sops.nix
index 214548e..b914584 100644
--- a/hosts/eldrid/sops.nix
+++ b/hosts/eldrid/sops.nix
@@ -15,6 +15,11 @@ in {
     secrets = {
       "user-password-hashed".neededForUsers = true;
       "ssh-private-eldrid-rmbuild" = {};
+      "ssh-config" = {
+        path = "/home/user/.ssh/config";
+        mode = "0400";
+        owner = "user";
+      };
       "ssh-private-eldrid-user" = {
         path = "/home/user/.ssh/id_ed25519";
         mode = "0400";
diff --git a/hosts/sarien/sops.nix b/hosts/sarien/sops.nix
index bf1d2ed..7310e4d 100644
--- a/hosts/sarien/sops.nix
+++ b/hosts/sarien/sops.nix
@@ -14,6 +14,11 @@ in {
     defaultSopsFile = "${secretsPath}/secrets.yaml";
     secrets = {
       "user-password-hashed".neededForUsers = true;
+      "ssh-config" = {
+        path = "/home/user/.ssh/config";
+        mode = "0400";
+        owner = "user";
+      };
       "ssh-private-sarien-user" = {
         path = "/home/user/.ssh/id_ed25519";
         mode = "0400";
diff --git a/modules/home/programs/shell/fish.nix b/modules/home/programs/shell/fish.nix
index e843e38..2edfc52 100644
--- a/modules/home/programs/shell/fish.nix
+++ b/modules/home/programs/shell/fish.nix
@@ -21,14 +21,6 @@ in {
       # };
       eza.enable = true;
       zoxide.enable = true;
-      keychain = {
-        enable = true;
-        keys = ["id_ed25519"];
-        extraFlags = [
-          "--quiet"
-          "--noask"
-        ];
-      };
       fish = {
         enable = true;
         shellAliases = {