Merge 477f2fb8c7 into e40cce5653

modules/neovim/mappings/config.nix

@@ -4,55 +4,74 @@
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
-  inherit (builtins) mapAttrs;
+  inherit (lib.trivial) pipe;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.lists) flatten;
 
-  processLegacyMap = modes: legacyMap: [(legacyMap // {mode = modes;})];
+  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 {
   config = {
     vim.keymaps = mkMerge [
-      (mkIf cfg.disableArrows {
+      (
-        "<up>" = [
+        mkIf cfg.disableArrows [
           {
+            key = "<up>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
           }
-        ];
-        "<down>" = [
           {
+            key = "<down>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
           }
-        ];
-        "<left>" = [
           {
+            key = "<left>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
           }
-        ];
-        "<right>" = [
           {
+            key = "<right>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
           }
-        ];
+        ]
-      })
+      )
-      (mapAttrs (_key: processLegacyMap ["n"]) cfg.maps.normal)
+      (
-      (mapAttrs (_key: processLegacyMap ["i"]) cfg.maps.insert)
+        pipe cfg.maps
-      (mapAttrs (_key: processLegacyMap ["s"]) cfg.maps.select)
+        [
-      (mapAttrs (_key: processLegacyMap ["v"]) cfg.maps.visual)
+          (mapAttrsToList (
-      (mapAttrs (_key: processLegacyMap ["t"]) cfg.maps.terminal)
+            oldMode: keybinds:
-      (mapAttrs (_key: processLegacyMap ["n" "v" "o"]) cfg.maps.normalVisualOp)
+              mapAttrsToList (
-      (mapAttrs (_key: processLegacyMap ["n" "x"]) cfg.maps.visualOnly)
+                key: bind:
-      (mapAttrs (_key: processLegacyMap ["o"]) cfg.maps.operator)
+                  bind
-      (mapAttrs (_key: processLegacyMap ["i" "c"]) cfg.maps.insertCommand)
+                  // {
-      (mapAttrs (_key: processLegacyMap ["l"]) cfg.maps.lang)
+                    inherit key;
-      (mapAttrs (_key: processLegacyMap ["c"]) cfg.maps.command)
+                    mode = legacyMapModes.${oldMode};
+                  }
+              )
+              keybinds
+          ))
+          flatten
+        ]
+      )
     ];
   };
 }

modules/neovim/mappings/options.nix

@@ -31,6 +31,12 @@
     options =
       mapConfigOptions
       // {
+        key = mkOption {
+          type = str;
+          description = ''
+            Key that triggers this keybind.
+          '';
+        };
         mode = mkOption {
           type = either str (listOf str);
           description = ''
@@ -44,31 +50,36 @@
   };
 
   # legacy stuff
-  mapOption = submodule {
+  legacyMapOption = submodule {
     options = mapConfigOptions;
   };
 
   mapOptions = mode:
     mkOption {
       description = "Mappings for ${mode} mode";
-      type = attrsOf mapOption;
+      type = attrsOf legacyMapOption;
       default = {};
     };
 in {
   options.vim = {
     keymaps = mkOption {
-      type = submodule {
+      type = listOf mapType;
-        freeformType = attrsOf (listOf mapType);
-      };
       description = "Custom keybindings.";
       example = ''
-        maps = {
+        vim.keymaps = [
-          "<leader>m" = {
+          {
+            key = "<leader>m";
             mode = "n";
             silent = true;
-            action = "<cmd>make<CR>";
+            action = ":make<CR>";
-          }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+          }
-        };
+          {
+            key = "<leader>l";
+            mode = ["n" "x"];
+            silent = true;
+            action = "<cmd>cnext<CR>";
+          }
+        ];
       '';
       default = {};
     };

modules/wrapper/rc/config.nix

@@ -6,7 +6,7 @@
   inherit (builtins) map mapAttrs filter;
   inherit (lib.attrsets) mapAttrsToList filterAttrs;
   inherit (lib.strings) concatLines concatMapStringsSep optionalString;
-  inherit (lib.trivial) showWarnings pipe;
+  inherit (lib.trivial) showWarnings;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
@@ -40,17 +40,9 @@ in {
       inherit (keymap) desc silent nowait script expr unique noremap;
     };
 
-    toLuaKeymap = key: bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";
+    toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";
 
-    maps =
+    maps = concatLines (map toLuaKeymap cfg.keymaps);
-      pipe
-      # attrsOf (listOf mapOption)
-      cfg.keymaps
-      [
-        (mapAttrsToList (key: binds:
-            concatLines (map (toLuaKeymap key) binds)))
-        concatLines
-      ];
 
     keymaps = maps;
   in {