From 5a7e7eff43224c0e492bc92547e548a16d899a19 Mon Sep 17 00:00:00 2001
From: Dobry Nikolov <dobry989@gmail.com>
Date: Tue, 2 Jun 2026 20:05:01 +0300
Subject: [PATCH] fix(nvimtree): move removed options to deprecations module

---
 modules/extra/deprecations.nix                 | 12 ++++++++++++
 modules/plugins/filetree/nvimtree/config.nix   | 10 ----------
 modules/plugins/filetree/nvimtree/nvimtree.nix | 13 +------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix
index 6ad2e633..3cee1fce 100644
--- a/modules/extra/deprecations.nix
+++ b/modules/extra/deprecations.nix
@@ -378,5 +378,17 @@ in {
     [
       (mkRenamedOptionModule ["vim" "languages" "typescript" "treesitter" "tsxPackage"] ["vim" "languages" "tsx" "treesitter" "package"])
     ]
+
+    # 2026-06-02
+    [
+      (mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "args"] ''
+        nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
+        See nvf issue #1621.
+      '')
+      (mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "cmd"] ''
+        nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
+        See nvf issue #1621.
+      '')
+    ]
   ];
 }
diff --git a/modules/plugins/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix
index 69d61a8c..b6faed56 100644
--- a/modules/plugins/filetree/nvimtree/config.nix
+++ b/modules/plugins/filetree/nvimtree/config.nix
@@ -14,16 +14,6 @@
   inherit (options.vim.filetree.nvimTree) mappings;
 in {
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = !(cfg.setupOpts ? system_open);
-        message = ''
-          vim.filetree.nvimTree.setupOpts.system_open was removed by nvim-tree.lua.
-          Use Neovim's vim.ui.open() instead. See nvf issue #1621.
-        '';
-      }
-    ];
-
     vim = {
       binds.whichKey.register = pushDownDefault {
         "<leader>t" = "+NvimTree";
diff --git a/modules/plugins/filetree/nvimtree/nvimtree.nix b/modules/plugins/filetree/nvimtree/nvimtree.nix
index da8a64ab..1bfdcb27 100644
--- a/modules/plugins/filetree/nvimtree/nvimtree.nix
+++ b/modules/plugins/filetree/nvimtree/nvimtree.nix
@@ -5,7 +5,6 @@
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption literalExpression;
-  inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.types) str bool int submodule listOf enum oneOf attrs addCheck;
   inherit (lib.nvim.types) mkPluginSetupOption;
@@ -69,18 +68,8 @@
     ["vim" "filetree" "nvimTree"]
     ["vim" "filetree" "nvimTree" "setupOpts"]
     migrationTable;
-
-  systemOpenRemovedMessage = ''
-    nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
-    See nvf issue #1621.
-  '';
 in {
-  imports =
-    renamedSetupOpts
-    ++ [
-      (mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "args"] systemOpenRemovedMessage)
-      (mkRemovedOptionModule ["vim" "filetree" "nvimTree" "systemOpen" "cmd"] systemOpenRemovedMessage)
-    ];
+  imports = renamedSetupOpts;
   options.vim.filetree.nvimTree = {
     enable = mkEnableOption "filetree via nvim-tree.lua";