diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 363a651..c33aa49 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -69,6 +69,14 @@
 
       zoxide init fish | source
       fnm env --use-on-cd --shell fish | source
+
+      if test -d (brew --prefix)"/share/fish/completions"
+          set -p fish_complete_path (brew --prefix)/share/fish/completions
+      end
+
+      if test -d (brew --prefix)"/share/fish/vendor_completions.d"
+          set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
+      end
     '';
 
     shellAbbrs = {
diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix
index f799df8..6b47cf9 100644
--- a/modules/ssh/default.nix
+++ b/modules/ssh/default.nix
@@ -2,8 +2,10 @@
 {
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "yes";
     matchBlocks = {
+      "*" = {
+        addKeysToAgent = "yes";
+      };
       "dnsc-server" = {
         hostname = "100.103.199.4";
         user = "dennis";