From fc584a3a41fdbecb41bc10c66b80cc8003d3cc2c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 5 Oct 2024 22:43:15 -0500
Subject: [PATCH] plugins/nvim-ufo: remove with lib and helpers

---
 plugins/by-name/nvim-ufo/default.nix | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/by-name/nvim-ufo/default.nix b/plugins/by-name/nvim-ufo/default.nix
index 016d5d67..b3e773bb 100644
--- a/plugins/by-name/nvim-ufo/default.nix
+++ b/plugins/by-name/nvim-ufo/default.nix
@@ -1,17 +1,17 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-with lib;
 let
+  inherit (lib.nixvim) defaultNullOpts;
+
   cfg = config.plugins.nvim-ufo;
 in
 {
-  options.plugins.nvim-ufo = helpers.neovim-plugin.extraOptionsOptions // {
-    enable = mkEnableOption "nvim-ufo";
+  options.plugins.nvim-ufo = lib.nixvim.neovim-plugin.extraOptionsOptions // {
+    enable = lib.mkEnableOption "nvim-ufo";
 
     package = lib.mkPackageOption pkgs "nvim-ufo" {
       default = [
@@ -20,25 +20,25 @@ in
       ];
     };
 
-    openFoldHlTimeout = helpers.defaultNullOpts.mkInt 400 ''
+    openFoldHlTimeout = defaultNullOpts.mkInt 400 ''
       Time in millisecond between the range to be highlgihted and to be cleared
       while opening the folded line, `0` value will disable the highlight
     '';
 
-    providerSelector = helpers.defaultNullOpts.mkLuaFn null ''
+    providerSelector = defaultNullOpts.mkLuaFn null ''
       A lua function as a selector for fold providers.
     '';
 
-    closeFoldKinds = helpers.mkNullOrOption types.attrs ''
+    closeFoldKinds = lib.nixvim.mkNullOrOption lib.types.attrs ''
       After the buffer is displayed (opened for the first time), close the
       folds whose range with `kind` field is included in this option. For now,
       'lsp' provider's standardized kinds are 'comment', 'imports' and 'region',
       run `UfoInspect` for details if your provider has extended the kinds.
     '';
 
-    foldVirtTextHandler = helpers.defaultNullOpts.mkLuaFn null "A lua function to customize fold virtual text";
+    foldVirtTextHandler = defaultNullOpts.mkLuaFn null "A lua function to customize fold virtual text";
 
-    enableGetFoldVirtText = helpers.defaultNullOpts.mkBool false ''
+    enableGetFoldVirtText = defaultNullOpts.mkBool false ''
       Enable a function with `lnum` as a parameter to capture the virtual text
       for the folded lines and export the function to `get_fold_virt_text` field of
       ctx table as 6th parameter in `fold_virt_text_handler`
@@ -46,16 +46,16 @@ in
 
     preview = {
       winConfig = {
-        border = helpers.defaultNullOpts.mkBorder "rounded" "preview window" "";
+        border = defaultNullOpts.mkBorder "rounded" "preview window" "";
 
-        winblend = helpers.defaultNullOpts.mkInt 12 "The winblend for preview window, `:h winblend`";
+        winblend = defaultNullOpts.mkInt 12 "The winblend for preview window, `:h winblend`";
 
-        winhighlight = helpers.defaultNullOpts.mkStr "Normal:Normal" "The winhighlight for preview window, `:h winhighlight`";
+        winhighlight = defaultNullOpts.mkStr "Normal:Normal" "The winhighlight for preview window, `:h winhighlight`";
 
-        maxheight = helpers.defaultNullOpts.mkInt 20 "The max height of preview window";
+        maxheight = defaultNullOpts.mkInt 20 "The max height of preview window";
       };
 
-      mappings = helpers.mkNullOrOption types.attrs "Mappings for preview window";
+      mappings = lib.nixvim.mkNullOrOption lib.types.attrs "Mappings for preview window";
     };
   };
 
@@ -77,11 +77,11 @@ in
         }
         // cfg.extraOptions;
     in
-    mkIf cfg.enable {
+    lib.mkIf cfg.enable {
       extraPlugins = [ cfg.package ];
 
       extraConfigLua = ''
-        require("ufo").setup(${helpers.toLuaObject options})
+        require("ufo").setup(${lib.nixvim.toLuaObject options})
       '';
     };
 }