diff --git a/.gitmodules b/.gitmodules
index 072ad6f..914712e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,3 @@
 	path = library/luv
 	url = https://github.com/LuaCATS/luv
 	branch = main
-[submodule "nvimv"]
-	path = nvimv
-	url = https://github.com/jrop/nvimv
-	branch = main
diff --git a/mise.toml b/mise.toml
index c413566..3ff358a 100644
--- a/mise.toml
+++ b/mise.toml
@@ -15,6 +15,7 @@ jq = "1.8.1"
 # but to avoid having to litter a bunch of commands with that environment
 # initialization, this just makes things simpler:
 neovim = "0.12.1"
+"http:nvimv" = { version = "latest", url = "https://raw.githubusercontent.com/jrop/nvimv/refs/heads/main/nvimv" }
 stylua = "2.3.1"
 "cargo:emmylua_ls" = "0.20.0"
 "cargo:emmylua_check" = "0.20.0"
@@ -44,10 +45,10 @@ echo
 if find .prefix -path '**/nightly/**/nvim' -mtime -1 2>/dev/null | grep -q .; then
   echo "Neovim Nightly is up-to-date"
 else
-  if ./nvimv/nvimv ls | grep nightly >/dev/null; then
-    ./nvimv/nvimv upgrade nightly
+  if nvimv ls | grep nightly >/dev/null; then
+    nvimv upgrade nightly
   else
-    ./nvimv/nvimv install nightly
+    nvimv install nightly
   fi
 fi
 echo
@@ -66,8 +67,8 @@ echo Neovim version=$usage_version
 echo -----------------------------
 echo -----------------------------
 echo
-./nvimv/nvimv install $usage_version
-eval $(./nvimv/nvimv env $usage_version)
+nvimv install $usage_version
+eval $(nvimv env $usage_version)
 busted --verbose
 '''
 
diff --git a/nvimv b/nvimv
deleted file mode 160000
index bd5c243..0000000
--- a/nvimv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd5c243b9606a93ec7034a9a8cbd5671951b90ff
diff --git a/spec/u_spec.lua b/spec/u_spec.lua
index 2b95967..9c8639c 100644
--- a/spec/u_spec.lua
+++ b/spec/u_spec.lua
@@ -1,6 +1,10 @@
 require 'luacov'
 
---- @diagnostic disable: undefined-field, need-check-nil
+--- @diagnostic disable: need-check-nil
+--- @diagnostic disable: param-type-mismatch
+--- @diagnostic disable: undefined-field
+--- @diagnostic disable: unnecessary-assert
+
 local Pos = require('u').Pos
 local Range = require('u').Range
 local function withbuf(lines, f)
@@ -374,9 +378,6 @@ describe('Range', function()
       vim.fn.setpos('.', { 0, 1, 1, 0 })
       vim.cmd.normal 'vll' -- select 'the' (3 chars)
 
-      -- Record initial visual marks
-      local initial_v = vim.fn.getpos 'v'
-
       -- Call from_motion (should save and restore visual selection)
       local range = Range.from_motion 'aw'
       assert.is_not_nil(range)
@@ -661,7 +662,7 @@ describe('Range', function()
       -- histget()
       local orig_histget = vim.fn.histget
       --- @diagnostic disable-next-line: duplicate-set-field
-      function vim.fn.histget(x, y) return [['<,'>]] end
+      function vim.fn.histget() return [['<,'>]] end
 
       -- Now run the test:
       local range = Range.from_cmd_args(args) --[[@as u.Range]]