From 0d871a7411828a223d78b7170ad2e43c3a902867 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Wed, 13 Aug 2025 13:28:32 +0200
Subject: [PATCH 1/2] fix: `writeShellScript` -> `writeShellScriptBin`: allow
 for adding to env

---
 pkgs/nix-search-fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/nix-search-fzf/default.nix b/pkgs/nix-search-fzf/default.nix
index 63e4a37..d9116fd 100644
--- a/pkgs/nix-search-fzf/default.nix
+++ b/pkgs/nix-search-fzf/default.nix
@@ -8,7 +8,7 @@
   coreutils,
   bash,
   nix-search-fzf,
-  writeShellScript,
+  writeShellScriptBin,
 }:
 
 let
@@ -28,7 +28,7 @@ createScript "nix-search-fzf" src {
   ];
 
   # Enter a 'nix shell' with packages selected by this script
-  passthru.zsh-shell-widget = writeShellScript "nix-search-fzf-shell-widget" ''
+  passthru.zsh-shell-widget = writeShellScriptBin "nix-search-fzf-shell-widget" ''
     nix-search-fzf-shell-widget() {
       setopt localoptions pipefail no_aliases 2> /dev/null
       local cmd="$(eval "${nix-search-fzf}/bin/nix-search-fzf -c")"

From 4891753215555b30d88f170539adabc7a9ece806 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Wed, 13 Aug 2025 13:30:03 +0200
Subject: [PATCH 2/2] feat: set better vi-mode; adds `nix-search-fzf`; fix:
 unbork `syntax-highlighting`

---
 modules/home/zsh.nix | 60 +++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
index 8a4e5de..0408d7f 100644
--- a/modules/home/zsh.nix
+++ b/modules/home/zsh.nix
@@ -12,18 +12,21 @@
       enable = true;
       autocd = true;
       autosuggestion.enable = true;
-      syntaxHighlighting = {
-        enable = true;
-        highlighters = [
-          "main"
-          "brackets"
-          "pattern"
-          "regexp"
-          "cursor"
-          "root"
-          "line"
-        ];
-      };
+      #syntaxHighlighting = {
+      #  enable = true;
+      #  highlighters = [
+      #    "main"
+      #    "brackets"
+      #    "pattern"
+      #    "regexp"
+      #    "cursor"
+      #    "root"
+      #    "line"
+      #  ];
+      #};
+
+      defaultKeymap = "viins";
+
       enableCompletion = true;
       # enableGlobalCompInit = true; # Should be a thing according to NixOS options but is not a thing?
 
@@ -44,6 +47,7 @@
         SAVEHIST = 10000000;
         HISTFILE = "~/.zsh_history";
         HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE = 1;
+        KEYTIMEOUT = 1; # make Vi-mode transitions faster
       };
 
       initContent = ''
@@ -139,7 +143,7 @@
         }
 
         # Enter a 'nix shell' with packages selected by fzf
-        source ${pkgs.nix-search-fzf.zsh-shell-widget}
+        source ${pkgs.nix-search-fzf.zsh-shell-widget}/bin/nix-search-fzf-shell-widget
         zle -N nix-search-fzf-shell-widget
         bindkey '^O' nix-search-fzf-shell-widget
 
@@ -228,16 +232,16 @@
       };
 
       plugins = with pkgs; [
-        #{
-        #  name = "zsh-syntax-highlighting";
-        #  src = fetchFromGitHub {
-        #    owner = "zsh-users";
-        #    repo = "zsh-syntax-highlighting";
-        #    rev = "0.6.0";
-        #    sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
-        #  };
-        #  file = "zsh-syntax-highlighting.zsh";
-        #}
+        {
+          name = "zsh-syntax-highlighting";
+          src = fetchFromGitHub {
+            owner = "zsh-users";
+            repo = "zsh-syntax-highlighting";
+            rev = "0.6.0";
+            sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
+          };
+          file = "zsh-syntax-highlighting.zsh";
+        }
         {
           name = "zsh-autopair";
           src = fetchFromGitHub {
@@ -248,6 +252,16 @@
           };
           file = "autopair.zsh";
         }
+        {
+          name = "zsh-vi-mode";
+          file = "zsh-vi-mode.plugin.zsh";
+          src = pkgs.fetchFromGitHub {
+            owner = "jeffreytse";
+            repo = "zsh-vi-mode";
+            rev = "3eeca1bc6db172edee5a2ca13d9ff588b305b455";
+            sha256 = "0na6b5b46k4473c53mv1wkb009i6b592gxpjq94bdnlz1kkcqwg6";
+          };
+        }
       ];
     };