Skip to content

Commit

Permalink
modules/neovim: deprecate vim.enableEditorconfig option
Browse files Browse the repository at this point in the history
Deprecate shorthand EditorConfig toggle, and encourage the more powerful `vim.globals` option.
  • Loading branch information
NotAShelf committed Dec 2, 2024
1 parent ce21e1f commit 5045736
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 16 deletions.
13 changes: 8 additions & 5 deletions docs/release-notes/rl-0.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ configuration formats.

### `vim.maps` rewrite {#sec-vim-maps-rewrite}

Instead of specifying map modes using submodules (eg.: `vim.maps.normal`), a new
`vim.keymaps` submodule with support for a `mode` option has been introduced. It
can be either a string, or a list of strings, where a string represents the
short-name of the map mode(s), that the mapping should be set for. See
`:help map-modes` for more information.
Instead of specifying map modes using submodules (e.g.: `vim.maps.normal`), a
new `vim.keymaps` submodule with support for a `mode` option has been
introduced. It can be either a string, or a list of strings, where a string
represents the short-name of the map mode(s), that the mapping should be set
for. See `:help map-modes` for more information.

For example:

Expand Down Expand Up @@ -334,6 +334,9 @@ The changes are, in no particular order:
`vim.options` as default values. Some are left as they don't have a direct
equivalent, but expect a switch eventually.

- Deprecated `vim.enableEditorconfig` in favor of
[](#opt-vim.globals.editorconfig).

[ppenguin](https://github.com/ppenguin):

- Telescope:
Expand Down
5 changes: 4 additions & 1 deletion modules/extra/deprecations.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,12 @@ in {
`tabstop` and `shiftwidth` manually in `vim.options` or per-filetype in a
`ftplugin` directory added to your runtime path.
'')

# 2024-12-02
(mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"])
]

# 2024-12-1
# 2024-12-01
# Migrated via batchRenameOptions. Further batch renames must be below this line.
renamedVimOpts
];
Expand Down
10 changes: 0 additions & 10 deletions modules/neovim/init/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ in {
description = "Set how bells are handled. Options: on, visual or none";
};

enableEditorconfig = mkOption {
type = bool;
default = true;
description = "Follow editorconfig rules in current directory";
};

searchCase = mkOption {
type = enum ["ignore" "smart" "sensitive"];
default = "sensitive";
Expand Down Expand Up @@ -112,10 +106,6 @@ in {
expandtab = true;
};

globals = pushDownDefault {
editorconfig = cfg.enableEditorconfig;
};

# Options that are more difficult to set through 'vim.options'. Fear not, though
# as the Lua DAG is still as powerful as it could be.
luaConfigRC.basic = entryAfter ["globalsScript"] ''
Expand Down
15 changes: 15 additions & 0 deletions modules/wrapper/rc/options.nix
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,21 @@ in {
default = ",";
description = "The key used for `<localleader>` mappings";
};

editorconfig = mkOption {
type = bool;
default = true;
description = ''
Whether to enable EditorConfig integration in Neovim.
This defaults to true as it is enabled by default in stock
Neovim, setting this option to false disables EditorConfig
integration entirely.
See [Neovim documentation](https://neovim.io/doc/user/editorconfig.html)
for more details on configuring EditorConfig behaviour.
'';
};
};
};

Expand Down

0 comments on commit 5045736

Please sign in to comment.