Merge 7324474ef8 into 73660af2e3

modules/wrapper/rc/options.nix

@@ -126,14 +126,16 @@ in {
 
       example = {"some_variable" = 42;};
       description = ''
-        A freeform attribute set containing global variable values for setting vim
+        An attribute set containing global variable values
-        variables as early as possible. If populated, this option will set vim variables
+        for storing vim variables as early as possible. If
-        in the built {option}`luaConfigRC` as the first item.
+        populated, this option will set vim variables in the
+        built luaConfigRC as the first item.
 
         ::: {.note}
-        `{foo = "bar";}` will set `vim.g.foo` to "bar", where the type of `bar` in the
+        `{foo = "bar";}` will set `vim.g.foo` to "bar", where
-        resulting Lua value will be inferred from the type of the value in the
+        the type of `bar` in the resulting Lua value will be
-        `{name = value;}` pair passed to the option.
+        inferred from the type of the value in the `{name = value;}`
+        pair passed to the option.
         :::
       '';
     };
@@ -210,39 +212,21 @@ in {
             default = true;
             description = "Enable word wrapping.";
           };
-
-          tabstop = mkOption {
-            type = int;
-            default = 8; # Neovim default
-            description = ''
-              Number of spaces that a `<Tab>` in the file counts for. Also see
-              the {command}`:retab` command, and the {option}`softtabstop` option.
-            '';
-          };
-
-          shiftwidth = mkOption {
-            type = int;
-            default = 8; # Neovim default
-            description = ''
-              Number of spaces to use for each step of (auto)indent. Used for
-              {option}`cindent`, `>>`, `<<`, etc.
-
-              When zero the {option}`tabstop` value will be used.
-            '';
-          };
         };
       };
 
       example = {visualbell = true;};
       description = ''
-        A freeform attribute set containing vim options to be set as early as possible.
+        An attribute set containing vim options to be set
-        If populated, this option will set vim options in the built {option}`luaConfigRC`
+        as early as possible. If populated, this option will
-        after `basic` and before `pluginConfigs` DAG entries.
+        set vim options in the built luaConfigRC after `basic`
+        and before `pluginConfigs` DAG entries.
 
         ::: {.note}
-        `{foo = "bar";}` will set `vim.o.foo` to "bar", where the type of `bar` in the
+        `{foo = "bar";}` will set `vim.o.foo` to "bar", where
-        resulting Lua value will be inferred from the type of the value in the
+        the type of `bar` in the resulting Lua value will be
-        `{name = value;}` pair passed to the option.
+        inferred from the type of the value in the`{name = value;}`
+        pair passed to the option.
         :::
       '';
     };