thinkpad-nixos/work: Refactor nixvim.extend

hostconfig/thinkpad-nixos/work.nix

@@ -12,14 +12,29 @@
   config = {
     workAddr = "quentin.boyer@***REMOVED***";
 
-    extraNixvim = {
-      extraConfigLuaPre = ''
-        team_picker = dofile("${./telescope-team.lua}")
-      '';
-      commands = {
-        Review = "lua team_picker()";
-      };
-    };
+    extraNixvim = [
+      (
+        { helpers, ... }:
+        {
+          extraConfigLuaPre = ''
+            team_picker = dofile("${./telescope-team.lua}")
+          '';
+          keymaps = [
+            {
+              key = "<leader>R";
+              mode = [
+                "n"
+                "i"
+              ];
+              action = helpers.mkRaw "team_picker";
+            }
+          ];
+          commands = {
+            Review = "lua team_picker()";
+          };
+        }
+      )
+    ];
 
     home.packages = [
       (pkgs.writeShellScriptBin "nwadminSendmail" ''

minimal/hm.nix

@@ -16,8 +16,8 @@
   };
 
   options.extraNixvim = lib.mkOption {
-    type = lib.types.attrsOf lib.types.anything;
-    default = { };
+    type = lib.types.listOf lib.types.anything;
+    default = [ ];
   };
 
   imports = [
@@ -84,7 +84,7 @@
             ;
         })
       ])
-      ++ [ (pkgs.neovimTraxys.nixvimExtend config.extraNixvim) ];
+      ++ [ (pkgs.neovimTraxys.extend { imports = config.extraNixvim; }) ];
 
     nix.registry = {
       "my".flake = flake;