From cf141c07a8012c89a0edcddd250a12781ecd926c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 19 Apr 2025 13:22:25 -0500 Subject: [PATCH] plugins/deprecations: move codeium enable option renames to top level deprecations Causes our checks to fail to have the rename alias done in the module themselves.. --- .../by-name/windsurf-nvim/deprecations.nix | 1 - plugins/by-name/windsurf-vim/deprecations.nix | 1 - plugins/deprecation.nix | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/plugins/by-name/windsurf-nvim/deprecations.nix b/plugins/by-name/windsurf-nvim/deprecations.nix index 27fd9318..afcb9116 100644 --- a/plugins/by-name/windsurf-nvim/deprecations.nix +++ b/plugins/by-name/windsurf-nvim/deprecations.nix @@ -45,7 +45,6 @@ lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-nvim" ] [ "plugins" "windsurf-nvim" ] [ - "enable" "package" "settings" { diff --git a/plugins/by-name/windsurf-vim/deprecations.nix b/plugins/by-name/windsurf-vim/deprecations.nix index 1657eedf..a971f562 100644 --- a/plugins/by-name/windsurf-vim/deprecations.nix +++ b/plugins/by-name/windsurf-vim/deprecations.nix @@ -22,7 +22,6 @@ lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ] [ "plugins" "windsurf-vim" ] [ - "enable" "package" "settings" "keymaps" diff --git a/plugins/deprecation.nix b/plugins/deprecation.nix index 64ade989..19784e53 100644 --- a/plugins/deprecation.nix +++ b/plugins/deprecation.nix @@ -56,6 +56,33 @@ in ++ (lib.mapAttrsToList ( old: new: lib.mkRenamedOptionModule [ "plugins" old ] [ "plugins" new ] ) renamed) + # TODO: introduced 2025-04-19 + ++ [ + (lib.mkRenamedOptionModule + [ + "plugins" + "codeium-nvim" + "enable" + ] + [ + "plugins" + "windsurf-nvim" + "enable" + ] + ) + (lib.mkRenamedOptionModule + [ + "plugins" + "codeium-vim" + "enable" + ] + [ + "plugins" + "windsurf-vim" + "enable" + ] + ) + ] ++ builtins.map ( name: lib.mkRemovedOptionModule [ "plugins" name "iconsPackage" ] ''