From 75b402e9f03ebf0ad83dd72f3825a700de956ede Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 15:49:24 +0300
Subject: [PATCH 1/3] neovim/init: deprecate `vim.disableArrows`; add missing
 rename

---
 modules/extra/deprecations.nix | 12 +++++++++++-
 modules/neovim/init/basic.nix  |  6 ------
 2 files changed, 11 insertions(+), 7 deletions(-)

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;

From e5ced28b67492838c6756534b9ca4a99a56cc350 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 16:02:50 +0300
Subject: [PATCH 2/3] ci: remove magic-nix-cache

---
 .github/workflows/cachix.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 4aa0b215..cac8ee51 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -35,7 +35,6 @@ jobs:
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - uses: cachix/cachix-action@v15
         with:

From 3f9078d7d94d7f163d165af327f2676a8217af1e Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 7 Feb 2025 17:00:45 +0300
Subject: [PATCH 3/3] neovim/mappings: remove remnants of `vim.disableArrows`

---
 modules/neovim/mappings/config.nix | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/neovim/mappings/config.nix b/modules/neovim/mappings/config.nix
index 4d7f2417..230df030 100644
--- a/modules/neovim/mappings/config.nix
+++ b/modules/neovim/mappings/config.nix
@@ -26,34 +26,6 @@
 in {
   config = {
     vim.keymaps = mkMerge [
-      (
-        mkIf cfg.disableArrows [
-          {
-            key = "<up>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<down>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<left>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-          {
-            key = "<right>";
-            mode = ["n" "i"];
-            action = "<nop>";
-            noremap = false;
-          }
-        ]
-      )
       (
         pipe cfg.maps
         [