diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix index 8d27d7ac..541d2894 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -4,6 +4,7 @@ inherit (lib.nvim.config) batchRenameOptions; renamedVimOpts = batchRenameOptions ["vim"] ["vim" "options"] { + # 2024-12-01 colourTerm = "termguicolors"; mouseSupport = "mouse"; cmdHeight = "cmdheight"; @@ -15,6 +16,9 @@ autoIndent = "autoindent"; wordWrap = "wrap"; showSignColumn = "signcolumn"; + + # 2025-02-07 + scrollOf = "scrolloff"; }; in { imports = concatLists [ @@ -93,9 +97,15 @@ in { # 2024-12-02 (mkRenamedOptionModule ["vim" "enableEditorconfig"] ["vim" "globals" "editorconfig"]) + + # 2025-02-06 + (mkRemovedOptionModule ["vim" "disableArrows"] '' + Top-level convenience options are now in the process of being removed from nvf as + their behaviour was abstract, and confusing. Please use 'vim.options' or 'vim.luaConfigRC' + to replicate previous behaviour. + '') ] - # 2024-12-01 # Migrated via batchRenameOptions. Further batch renames must be below this line. renamedVimOpts ]; diff --git a/modules/neovim/init/basic.nix b/modules/neovim/init/basic.nix index b4677de9..47bfe500 100644 --- a/modules/neovim/init/basic.nix +++ b/modules/neovim/init/basic.nix @@ -16,12 +16,6 @@ cfg = config.vim; in { options.vim = { - disableArrows = mkOption { - type = bool; - default = false; - description = "Set to prevent arrow keys from moving cursor"; - }; - hideSearchHighlight = mkOption { type = bool; default = false;