diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
index 0408d7f..8a4e5de 100644
--- a/modules/home/zsh.nix
+++ b/modules/home/zsh.nix
@@ -12,21 +12,18 @@
       enable = true;
       autocd = true;
       autosuggestion.enable = true;
-      #syntaxHighlighting = {
-      #  enable = true;
-      #  highlighters = [
-      #    "main"
-      #    "brackets"
-      #    "pattern"
-      #    "regexp"
-      #    "cursor"
-      #    "root"
-      #    "line"
-      #  ];
-      #};
-
-      defaultKeymap = "viins";
-
+      syntaxHighlighting = {
+        enable = true;
+        highlighters = [
+          "main"
+          "brackets"
+          "pattern"
+          "regexp"
+          "cursor"
+          "root"
+          "line"
+        ];
+      };
       enableCompletion = true;
       # enableGlobalCompInit = true; # Should be a thing according to NixOS options but is not a thing?
 
@@ -47,7 +44,6 @@
         SAVEHIST = 10000000;
         HISTFILE = "~/.zsh_history";
         HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE = 1;
-        KEYTIMEOUT = 1; # make Vi-mode transitions faster
       };
 
       initContent = ''
@@ -143,7 +139,7 @@
         }
 
         # Enter a 'nix shell' with packages selected by fzf
-        source ${pkgs.nix-search-fzf.zsh-shell-widget}/bin/nix-search-fzf-shell-widget
+        source ${pkgs.nix-search-fzf.zsh-shell-widget}
         zle -N nix-search-fzf-shell-widget
         bindkey '^O' nix-search-fzf-shell-widget
 
@@ -232,16 +228,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 {
@@ -252,16 +248,6 @@
           };
           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";
-          };
-        }
       ];
     };
 
diff --git a/pkgs/nix-search-fzf/default.nix b/pkgs/nix-search-fzf/default.nix
index d9116fd..63e4a37 100644
--- a/pkgs/nix-search-fzf/default.nix
+++ b/pkgs/nix-search-fzf/default.nix
@@ -8,7 +8,7 @@
   coreutils,
   bash,
   nix-search-fzf,
-  writeShellScriptBin,
+  writeShellScript,
 }:
 
 let
@@ -28,7 +28,7 @@ createScript "nix-search-fzf" src {
   ];
 
   # Enter a 'nix shell' with packages selected by this script
-  passthru.zsh-shell-widget = writeShellScriptBin "nix-search-fzf-shell-widget" ''
+  passthru.zsh-shell-widget = writeShellScript "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")"