diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 4b76e02e8..65797ccd9 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -57,6 +57,8 @@ in
         type = types.bool;
       };
 
+      package = lib.mkPackageOption pkgs "fish" { };
+
       useBabelfish = mkOption {
         type = types.bool;
         default = false;
@@ -238,7 +240,7 @@ in
           ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
       }
 
-      { systemPackages = [ pkgs.fish ]; }
+      { systemPackages = [ cfg.package ]; }
     ];
   };
 
diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index c6ec91754..65689bade 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -204,7 +204,7 @@ in
       }
 
       ${optionalString cfg.enableFastSyntaxHighlighting
-        "source ${pkgs.zsh-fast-syntax-highlighting}/share/zsh-fast-syntax-highlighting/zsh-fast-syntax-highlighting.zsh"
+        "source ${pkgs.zsh-fast-syntax-highlighting}/share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh"
       }
 
       ${optionalString cfg.enableFzfCompletion "source ${fzfCompletion}"}