Merge c7df5c97f3 into 773186d93d

lib/binds.nix

@@ -71,6 +71,24 @@
     mkLznBinding = mode: lhs: rhs: desc: {
       inherit mode lhs rhs desc;
     };
+
+    # Usage:
+    #
+    # ```
+    # vim.lazy.plugins = {
+    #   telescope = {
+    #     # ...
+    #     keys = builtins.filter ({lhs, ...}: lhs != null) [
+    #       mkSetLznBinding mapping ":Telescope<CR>"
+    #     ];
+    #   }
+    # }
+    # ```
+    mkSetLznBinding = binding: action: {
+      lhs = binding.value;
+      rhs = action;
+      desc = binding.description;
+    };
   };
 in
   binds

modules/wrapper/lazy/config.nix

@@ -31,15 +31,30 @@
     (removeAttrs spec ["package" "setupModule" "setupOpts" "keys"])
     // {
       "@1" = name;
-      after = mkLuaInline ''
+      before =
-        function()
+        if spec.before != null
-          ${
+        then
-          optionalString (spec.setupModule != null)
+          mkLuaInline ''
-          "require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
+            function()
-        }
+              ${spec.before}
-          ${optionalString (spec.after != null) spec.after}
+            end
-        end
+          ''
-      '';
+        else null;
+
+      after =
+        if spec.setupModule == null && spec.after == null
+        then null
+        else
+          mkLuaInline ''
+            function()
+              ${
+              optionalString (spec.setupModule != null)
+              "require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
+            }
+              ${optionalString (spec.after != null) spec.after}
+            end
+          '';
+
       keys =
         if typeOf spec.keys == "list" && length spec.keys > 0 && typeOf (head spec.keys) == "set"
         then map toLuzLznKeySpec spec.keys