From 2165857a24668cc3cb09c052eb0d518a1dfa6d3f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 18 Dec 2024 09:44:07 -0500
Subject: [PATCH 1/2] fish: add package option

---
 modules/programs/fish.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 ]; }
     ];
   };
 

From daf9d9fe5d5a7a5ef25aa446582f8c656aab2b9b Mon Sep 17 00:00:00 2001
From: Xingquan Liu <b1n@b1n.io>
Date: Tue, 17 Dec 2024 23:03:57 +0800
Subject: [PATCH 2/2] fix(zsh): correct the path of
 zsh-fast-syntax-highlighting

---
 modules/programs/zsh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}"}