From e60ea678ac9a4154b641fdaacf03c600d1c661d8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Jan 2025 07:57:18 +0100
Subject: [PATCH] plugins/emmet: cosmetic refactoring

---
 plugins/by-name/emmet/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/by-name/emmet/default.nix b/plugins/by-name/emmet/default.nix
index e13e4ddef9..5156bef28f 100644
--- a/plugins/by-name/emmet/default.nix
+++ b/plugins/by-name/emmet/default.nix
@@ -1,17 +1,18 @@
 {
   lib,
-  helpers,
   ...
 }:
-with lib;
-with lib.nixvim.plugins;
-mkVimPlugin {
+let
+  inherit (lib) types;
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
+in
+lib.nixvim.plugins.mkVimPlugin {
   name = "emmet";
   packPathName = "emmet-vim";
   package = "emmet-vim";
   globalPrefix = "user_emmet_";
 
-  maintainers = [ maintainers.GaetanLepage ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 
   # TODO introduced 2024-03-01: remove 2024-05-01
   deprecateExtraConfig = true;
@@ -24,7 +25,7 @@ mkVimPlugin {
   ];
 
   settingsOptions = {
-    mode = helpers.defaultNullOpts.mkStr "a" ''
+    mode = defaultNullOpts.mkStr "a" ''
       Choose modes, in which Emmet mappings will be created.
       Default value: 'a' - all modes.
       - 'n' - normal mode.
@@ -37,11 +38,11 @@ mkVimPlugin {
       - create Emmet mappings for all modes: `a`
     '';
 
-    leader_key = helpers.defaultNullOpts.mkStr "<C-y>" ''
+    leader_key = defaultNullOpts.mkStr "<C-y>" ''
       Leading keys to run Emmet functions.
     '';
 
-    settings = helpers.mkNullOrOption (with types; attrsOf anything) ''
+    settings = mkNullOrOption (with types; attrsOf anything) ''
       Emmet settings.
 
       Defaults: see https://github.com/mattn/emmet-vim/blob/master/autoload/emmet.vim