modules/extra/deprecations.nix

@@ -60,6 +60,9 @@ in {
       upstream, it no longer makes sense, nor works, to toggle only Trouble.
     '')
     # 2024-11-30
-    (mkRenamedOptionModule ["vim" "leaderKey"] ["vim" "globals" "mapleader"])
+    (mkRemovedOptionModule ["vim" "leaderKey"] ''
+      This has been deprecated in favor of using the more generic `vim.globals`
+      (you can use `vim.globals.mapleader` to change this instead).
+    '')
   ];
 }

modules/wrapper/rc/options.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
-  inherit (lib.types) str attrs lines listOf either path submodule anything;
+  inherit (lib.types) str attrs lines listOf either path;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
 
@@ -100,21 +100,10 @@ in {
     };
 
     globals = mkOption {
-      default = {};
+      type = attrs;
-      type = submodule {
+      default = {
-        freeformType = anything;
+        mapleader = " ";
-        options = {
+        maplocalleader = ",";
-          mapleader = mkOption {
-            type = str;
-            default = " ";
-            description = "The key used for <leader> mappings";
-          };
-          maplocalleader = mkOption {
-            type = str;
-            default = ",";
-            description = "The key used for <localleader> mappings";
-          };
-        };
       };
       example = {"some_variable" = 42;};
       description = ''