diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4a9f5640da43..e9edca787560 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17190,6 +17190,13 @@
     githubId = 110892040;
     name = "Mykyta Polchanov";
   };
+  myzel394 = {
+    email = "github.7a2op@simplelogin.co";
+    github = "Myzel394";
+    githubId = 50424412;
+    matrix = "@myzel394:matrix.org";
+    name = "Myzel394";
+  };
   mzabani = {
     email = "mzabani@gmail.com";
     github = "mzabani";
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 49f9569fd352..0f65f5f8e30d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6612,20 +6612,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  jsonfly-nvim = buildVimPlugin {
-    pname = "jsonfly.nvim";
-    version = "2024-09-30";
-    src = fetchFromGitHub {
-      owner = "Myzel394";
-      repo = "jsonfly.nvim";
-      rev = "d713d9ef38115ab09b4a2828dac67b2b3f7d35c4";
-      sha256 = "12nafsy2s01ci679sj6s980kx4lgd7zyqng7xv3gbf2r2xvj3prr";
-      fetchSubmodules = true;
-    };
-    meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
     version = "2025-02-22";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix
new file mode 100644
index 000000000000..22d445b55ded
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  fetchFromGitea,
+  vimUtils,
+  nix-update-script,
+}:
+vimUtils.buildVimPlugin {
+  pname = "jsonfly.nvim";
+  version = "0-unstable-2025-06-07";
+
+  src = fetchFromGitea {
+    domain = "git.myzel394.app";
+    owner = "Myzel394";
+    repo = "jsonfly.nvim";
+    rev = "db4394d856059d99d82ea2c75d033721e9dcb1fc";
+    hash = "sha256-PmYm+vZ0XONoHUo08haBozbXRpN+/LAlr6Fyg7anTNw=";
+  };
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Search blazingly fast for JSON / XML / YAML keys via Telescope";
+    homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim";
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ myzel394 ];
+  };
+}
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index b46ec709540f..219c65e60e87 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -506,7 +506,6 @@ https://github.com/nanotech/jellybeans.vim/,,
 https://github.com/HiPhish/jinja.vim/,HEAD,
 https://github.com/vito-c/jq.vim/,,
 https://github.com/neoclide/jsonc.vim/,,
-https://github.com/Myzel394/jsonfly.nvim/,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/JuliaEditorSupport/julia-vim/,,