From 2839ef54aaaa0ca797659a1db45876260b93b1eb Mon Sep 17 00:00:00 2001
From: Trevor Opiyo <driest.gravels_0j@icloud.com>
Date: Wed, 20 Mar 2024 20:12:46 -0500
Subject: [PATCH 1/4] Add support for zsh-fast-syntax-highlighting

---
 modules/programs/zsh/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index bbf8ad9e..c7ff47c4 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -107,6 +107,12 @@ in
       default = false;
       description = "Enable zsh-syntax-highlighting.";
     };
+
+    programs.zsh.enableFastSyntaxHighlighting = mkOption {
+      type = types.bool;
+      default = false;
+      description = lib.mdDoc "Enable zsh-fast-syntax-highlighting.";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -115,7 +121,8 @@ in
       [ # Include zsh package
         pkgs.zsh
       ] ++ optional cfg.enableCompletion pkgs.nix-zsh-completions
-        ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting;
+        ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting
+        ++ optional cfg.enableFastSyntaxHighlighting pkgs.zsh-fast-syntax-highlighting;
 
     environment.pathsToLink = [ "/share/zsh" ];
 
@@ -196,6 +203,10 @@ in
         "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
       }
 
+      ${optionalString cfg.enableFastSyntaxHighlighting
+        "source ${pkgs.zsh-fast-syntax-highlighting}/share/zsh-fast-syntax-highlighting/zsh-fast-syntax-highlighting.zsh"
+      }
+
       ${optionalString cfg.enableFzfCompletion "source ${fzfCompletion}"}
       ${optionalString cfg.enableFzfGit "source ${fzfGit}"}
       ${optionalString cfg.enableFzfHistory "source ${fzfHistory}"}

From 44c88484c4c386f3eae8a5398e9b22a78d606e43 Mon Sep 17 00:00:00 2001
From: Trevor Opiyo <trevoropiyo@trevoropiyo.com>
Date: Wed, 29 May 2024 12:23:59 -0500
Subject: [PATCH 2/4] add warning for enabling syntax highlighting and fast
 syntax highlighting

---
 modules/programs/zsh/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index c7ff47c4..d3b2f5c6 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -117,6 +117,9 @@ in
 
   config = mkIf cfg.enable {
 
+    warnings = mkIf (cfg.enableFastSyntaxHighlighting && cfg.enableSyntaxHighlighting) [
+      "zsh-fast-syntax-highlighting and zsh-syntax-highlighting are mutually exclusive. Disable one of them."
+    ];
     environment.systemPackages =
       [ # Include zsh package
         pkgs.zsh

From 897fc37c47d2592c475f8732f3f1a4fbc9f18f9e Mon Sep 17 00:00:00 2001
From: Trevor Opiyo <driest.gravels_0j@icloud.com>
Date: Tue, 5 Nov 2024 08:16:35 -0600
Subject: [PATCH 3/4] Update default.nix

Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
---
 modules/programs/zsh/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index d3b2f5c6..6555bacc 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -117,8 +117,11 @@ in
 
   config = mkIf cfg.enable {
 
-    warnings = mkIf (cfg.enableFastSyntaxHighlighting && cfg.enableSyntaxHighlighting) [
-      "zsh-fast-syntax-highlighting and zsh-syntax-highlighting are mutually exclusive. Disable one of them."
+    assertions = [
+      {
+        assertion = !(cfg.enableSyntaxHighlighting && cfg.enableFastSyntaxHighlighting);
+        message = "zsh-syntax-highlighting and zsh-fast-syntax-highlighting are mutually exclusive, please disable one of them.";
+      }
     ];
     environment.systemPackages =
       [ # Include zsh package

From 48e5c8de1a4575441b46cb174afebfa02732c0ff Mon Sep 17 00:00:00 2001
From: Trevor Opiyo <driest.gravels_0j@icloud.com>
Date: Wed, 6 Nov 2024 01:10:24 -0600
Subject: [PATCH 4/4] Update modules/programs/zsh/default.nix

Changes added by Enzime

Co-authored-by: Michael Hoang <Enzime@users.noreply.github.com>
---
 modules/programs/zsh/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index 6555bacc..652ba583 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -108,11 +108,7 @@ in
       description = "Enable zsh-syntax-highlighting.";
     };
 
-    programs.zsh.enableFastSyntaxHighlighting = mkOption {
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc "Enable zsh-fast-syntax-highlighting.";
-    };
+    programs.zsh.enableFastSyntaxHighlighting = mkEnableOption "zsh-fast-syntax-highlighting";
   };
 
   config = mkIf cfg.enable {