diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index 1bcc81b..73f6da7 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -29,11 +29,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1723444276,
-        "narHash": "sha256-ErWXmB84hedrDmeaHOaFFfNShC21AopTfM4x4rlvk3c=",
+        "lastModified": 1723530607,
+        "narHash": "sha256-FaXZZLLDW1D+pj7UgrIslDS8XjMMG3Pus5gAvUYWQS0=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "70c22198ab822aa93c92a7ec0933908b17131edd",
+        "rev": "296d44c440302980824c5f3b67e477cf0522e0c1",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1723463118,
-        "narHash": "sha256-MluNSC9G6biFeY3GL7ubpP922lZHj6MFivIyROpLnUM=",
+        "lastModified": 1723560828,
+        "narHash": "sha256-ro7HwspYAl6IO/GdO6K/YY7T9wSA+8hbuMmuHLZ9yJU=",
         "owner": "nixOS",
         "repo": "nixpkgs",
-        "rev": "2d8b5bc8b35dd0c61f8254ebf5102ef861ae574e",
+        "rev": "0f10078f7ece7e372bd6f24d6559d7323d4b7037",
         "type": "github"
       },
       "original": {
@@ -318,11 +318,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1723304838,
-        "narHash": "sha256-xAxVDxuvCs8WWkrxVWjCiqxTkHhGj7sSppr1YMuEdT8=",
+        "lastModified": 1723473250,
+        "narHash": "sha256-Ls0e6R4FmGUFXZlUcm6ZQaVNJ4Yj/nua4SSctXIopao=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "0daeb5c0b05cfdf2101b0f078c27539099bf38e6",
+        "rev": "32a86cb1dad2b208e8f36f1bb50c2e4806b0371f",
         "type": "github"
       },
       "original": {
diff --git a/nix/home-manager/modules/packages/zsh.nix b/nix/home-manager/modules/packages/zsh.nix
index 50e6696..2ece39d 100644
--- a/nix/home-manager/modules/packages/zsh.nix
+++ b/nix/home-manager/modules/packages/zsh.nix
@@ -31,7 +31,7 @@ in {
         ++ [
           "zdharma-continuum/fast-syntax-highlighting"
           "zsh-users/zsh-completions"
-          "b4b4r07/zsh-vimode-visual"
+          "jeffreytse/zsh-vi-mode"
           "reegnz/jq-zsh-plugin"
           "${ohmyzsh-lib}/completion.zsh"
           "${ohmyzsh-lib}/git.zsh"
diff --git a/zsh/zshrc b/zsh/zshrc
index 918d69d..0149d0b 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -27,6 +27,12 @@ zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
 # Both because it's nice and as an example
 zstyle ':completion:*:git:*' group-order 'main commands' 'alias commands' 'external commands'
 
+# zsh-vi-mode stuff
+ZVM_VI_SURROUND_BINDKEY="s-prefix"
+ZVM_READKEY_ENDINE=$ZVM_READKEY_ENGINE_NEX
+ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLOCK
+ZVM_LINE_INIT_MODE=$ZVM_MODE_INSERT
+
 # zstyle ":completion:*" complete _complete _ignored _approximate _expand
 # zstyle ":completion:*" glob 1
 # zstyle ":completion:*" insert-unambiguous true