From 1d2b8e2d409d79bf69e5105b1a9ac171ef644791 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 27 Jan 2026 12:54:02 +0300
Subject: [PATCH] modules: move mappings to `neovim/init`

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I9b04107496df27dcda1a24ce000da3f46a6a6964
---
 modules/modules.nix                 |   1 -
 modules/neovim/init/default.nix     |   1 +
 modules/neovim/init/mappings.nix    | 156 ++++++++++++++++++++++++++++
 modules/neovim/mappings/config.nix  |  27 -----
 modules/neovim/mappings/default.nix |   6 --
 modules/neovim/mappings/options.nix | 104 -------------------
 6 files changed, 157 insertions(+), 138 deletions(-)
 create mode 100644 modules/neovim/init/mappings.nix
 delete mode 100644 modules/neovim/mappings/default.nix

diff --git a/modules/modules.nix b/modules/modules.nix
index 654cd5ce..63605805 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -10,7 +10,6 @@
     # such as spellchecking, mappings, and the init script (init.vim).
     neovim = map (p: ./neovim + "/${p}") [
       "init"
-      "mappings"
     ];
 
     # Individual plugin modules, separated by the type of plugin.
diff --git a/modules/neovim/init/default.nix b/modules/neovim/init/default.nix
index 641cc0e1..e831fab6 100644
--- a/modules/neovim/init/default.nix
+++ b/modules/neovim/init/default.nix
@@ -8,6 +8,7 @@
     ./filetype.nix
     ./highlight.nix
     ./lsp.nix
+    ./mappings.nix
     ./spellcheck.nix
     ./util.nix
   ];
diff --git a/modules/neovim/init/mappings.nix b/modules/neovim/init/mappings.nix
new file mode 100644
index 00000000..0f665101
--- /dev/null
+++ b/modules/neovim/init/mappings.nix
@@ -0,0 +1,156 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkMerge;
+  inherit (lib.options) mkOption literalMD;
+  inherit (lib.types) either str listOf attrsOf nullOr submodule;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.lists) flatten;
+  inherit (lib.trivial) pipe;
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.config) mkBool;
+
+  mapConfigOptions = {
+    desc = mkOption {
+      type = nullOr str;
+      default = null;
+      description = ''
+        Description for the keybind, to be shown in which-key, if you have enabled
+        in the module system.
+      '';
+    };
+
+    action = mkOption {
+      type = str;
+      description = "The command to execute.";
+    };
+
+    lua = mkBool false ''
+      If true, `action` is considered to be lua code.
+      Thus, it will not be wrapped in `""`.
+    '';
+
+    silent = mkBool true "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+    nowait = mkBool false "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
+    script = mkBool false "Equivalent to adding <script> to a map.";
+    expr = mkBool false "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
+    unique = mkBool false "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
+    noremap = mkBool true "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
+  };
+
+  mapType = submodule {
+    options =
+      mapConfigOptions
+      // {
+        key = mkOption {
+          type = nullOr str;
+          description = "The key that triggers this keybind.";
+        };
+        mode = mkOption {
+          type = either str (listOf str);
+          description = ''
+            The short-name of the mode to set the keymapping for. Passing an empty string is the equivalent of `:map`.
+
+            See `:help map-modes` for a list of modes.
+          '';
+          example = literalMD ''`["n" "v" "c"]` for normal, visual and command mode'';
+        };
+      };
+  };
+
+  legacyMapOption = mode:
+    mkOption {
+      description = "Mappings for ${mode} mode";
+      type = attrsOf (submodule {
+        options = mapConfigOptions;
+      });
+      default = {};
+    };
+
+  legacyMapModes = {
+    normal = ["n"];
+    insert = ["i"];
+    select = ["s"];
+    visual = ["v"];
+    terminal = ["t"];
+    normalVisualOp = ["n" "v" "o"];
+    visualOnly = ["n" "x"];
+    operator = ["o"];
+    insertCommand = ["i" "c"];
+    lang = ["l"];
+    command = ["c"];
+  };
+
+  cfg = config.vim;
+in {
+  options.vim = {
+    vendoredKeymaps.enable =
+      mkEnableOption "this project's vendored keymaps by default"
+      // {
+        default = true;
+        example = false;
+      };
+
+    keymaps = mkOption {
+      type = listOf mapType;
+      description = "Custom keybindings.";
+      example = ''
+        vim.keymaps = [
+          {
+            key = "<leader>m";
+            mode = "n";
+            silent = true;
+            action = ":make<CR>";
+          }
+          {
+            key = "<leader>l";
+            mode = ["n" "x"];
+            silent = true;
+            action = "<cmd>cnext<CR>";
+          }
+        ];
+      '';
+      default = {};
+    };
+
+    maps = {
+      normal = legacyMapOption "normal";
+      insert = legacyMapOption "insert";
+      select = legacyMapOption "select";
+      visual = legacyMapOption "visual and select";
+      terminal = legacyMapOption "terminal";
+      normalVisualOp = legacyMapOption "normal, visual, select and operator-pending (same as plain 'map')";
+
+      visualOnly = legacyMapOption "visual only";
+      operator = legacyMapOption "operator-pending";
+      insertCommand = legacyMapOption "insert and command-line";
+      lang = legacyMapOption "insert, command-line and lang-arg";
+      command = legacyMapOption "command-line";
+    };
+  };
+
+  config = {
+    vim.keymaps = mkMerge [
+      (
+        pipe cfg.maps
+        [
+          (mapAttrsToList (
+            oldMode: keybinds:
+              mapAttrsToList (
+                key: bind:
+                  bind
+                  // {
+                    inherit key;
+                    mode = legacyMapModes.${oldMode};
+                  }
+              )
+              keybinds
+          ))
+          flatten
+        ]
+      )
+    ];
+  };
+}
diff --git a/modules/neovim/mappings/config.nix b/modules/neovim/mappings/config.nix
index a62a6ca2..11ddb0fd 100644
--- a/modules/neovim/mappings/config.nix
+++ b/modules/neovim/mappings/config.nix
@@ -3,11 +3,6 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkMerge;
-  inherit (lib.trivial) pipe;
-  inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.lists) flatten;
-
   legacyMapModes = {
     normal = ["n"];
     insert = ["i"];
@@ -24,26 +19,4 @@
 
   cfg = config.vim;
 in {
-  config = {
-    vim.keymaps = mkMerge [
-      (
-        pipe cfg.maps
-        [
-          (mapAttrsToList (
-            oldMode: keybinds:
-              mapAttrsToList (
-                key: bind:
-                  bind
-                  // {
-                    inherit key;
-                    mode = legacyMapModes.${oldMode};
-                  }
-              )
-              keybinds
-          ))
-          flatten
-        ]
-      )
-    ];
-  };
 }
diff --git a/modules/neovim/mappings/default.nix b/modules/neovim/mappings/default.nix
deleted file mode 100644
index fe9e1b8e..00000000
--- a/modules/neovim/mappings/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./options.nix
-  ];
-}
diff --git a/modules/neovim/mappings/options.nix b/modules/neovim/mappings/options.nix
index de19b54d..e69de29b 100644
--- a/modules/neovim/mappings/options.nix
+++ b/modules/neovim/mappings/options.nix
@@ -1,104 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption mkOption literalMD;
-  inherit (lib.types) either str listOf attrsOf nullOr submodule;
-  inherit (lib.nvim.config) mkBool;
-
-  mapConfigOptions = {
-    desc = mkOption {
-      type = nullOr str;
-      default = null;
-      description = "A description of this keybind, to be shown in which-key, if you have it enabled.";
-    };
-
-    action = mkOption {
-      type = str;
-      description = "The command to execute.";
-    };
-    lua = mkBool false ''
-      If true, `action` is considered to be lua code.
-      Thus, it will not be wrapped in `""`.
-    '';
-
-    silent = mkBool true "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
-    nowait = mkBool false "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
-    script = mkBool false "Equivalent to adding <script> to a map.";
-    expr = mkBool false "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
-    unique = mkBool false "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
-    noremap = mkBool true "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
-  };
-
-  mapType = submodule {
-    options =
-      mapConfigOptions
-      // {
-        key = mkOption {
-          type = nullOr str;
-          description = "The key that triggers this keybind.";
-        };
-        mode = mkOption {
-          type = either str (listOf str);
-          description = ''
-            The short-name of the mode to set the keymapping for. Passing an empty string is the equivalent of `:map`.
-
-            See `:help map-modes` for a list of modes.
-          '';
-          example = literalMD ''`["n" "v" "c"]` for normal, visual and command mode'';
-        };
-      };
-  };
-
-  legacyMapOption = mode:
-    mkOption {
-      description = "Mappings for ${mode} mode";
-      type = attrsOf (submodule {
-        options = mapConfigOptions;
-      });
-      default = {};
-    };
-in {
-  options.vim = {
-    vendoredKeymaps.enable =
-      mkEnableOption "this project's vendored keymaps by default"
-      // {
-        default = true;
-        example = false;
-      };
-
-    keymaps = mkOption {
-      type = listOf mapType;
-      description = "Custom keybindings.";
-      example = ''
-        vim.keymaps = [
-          {
-            key = "<leader>m";
-            mode = "n";
-            silent = true;
-            action = ":make<CR>";
-          }
-          {
-            key = "<leader>l";
-            mode = ["n" "x"];
-            silent = true;
-            action = "<cmd>cnext<CR>";
-          }
-        ];
-      '';
-      default = {};
-    };
-
-    maps = {
-      normal = legacyMapOption "normal";
-      insert = legacyMapOption "insert";
-      select = legacyMapOption "select";
-      visual = legacyMapOption "visual and select";
-      terminal = legacyMapOption "terminal";
-      normalVisualOp = legacyMapOption "normal, visual, select and operator-pending (same as plain 'map')";
-
-      visualOnly = legacyMapOption "visual only";
-      operator = legacyMapOption "operator-pending";
-      insertCommand = legacyMapOption "insert and command-line";
-      lang = legacyMapOption "insert, command-line and lang-arg";
-      command = legacyMapOption "command-line";
-    };
-  };
-}