From ac4b36d550ffe396d3b759fc4494f1173e2f71f2 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sun, 26 May 2024 16:03:18 +0800
Subject: [PATCH] nixvim: update helper library usage

Hope nothing like this ever happen again. It's a pain to track where
errors are coming from when debugging nixpkgs modules. T_T
---
 modules/nixvim/plugins/dressing-nvim.nix     | 2 +-
 modules/nixvim/plugins/firenvim.nix          | 4 +++-
 modules/nixvim/plugins/legendary-nvim.nix    | 2 +-
 modules/nixvim/plugins/lush-nvim.nix         | 2 +-
 modules/nixvim/plugins/nvim-config-local.nix | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/nixvim/plugins/dressing-nvim.nix b/modules/nixvim/plugins/dressing-nvim.nix
index bd86dc5b..66c159c5 100644
--- a/modules/nixvim/plugins/dressing-nvim.nix
+++ b/modules/nixvim/plugins/dressing-nvim.nix
@@ -7,7 +7,7 @@ in
   options.plugins.dressing-nvim = {
     enable = lib.mkEnableOption "dressing.nvim configuration";
 
-    package = helpers.mkPackageOption "dressing.nvim" pkgs.vimPlugins.dressing-nvim;
+    package = helpers.mkPluginPackageOption "dressing.nvim" pkgs.vimPlugins.dressing-nvim;
 
     settings = lib.mkOption {
       type = with lib.types; attrsOf anything;
diff --git a/modules/nixvim/plugins/firenvim.nix b/modules/nixvim/plugins/firenvim.nix
index 81420d51..427185d0 100644
--- a/modules/nixvim/plugins/firenvim.nix
+++ b/modules/nixvim/plugins/firenvim.nix
@@ -6,7 +6,9 @@ in
 {
   options.plugins.firenvim = {
     enable = lib.mkEnableOption "Firenvim";
-    package = helpers.mkPackageOption "firenvim" pkgs.vimPlugins.firenvim;
+
+    package = helpers.mkPluginPackageOption "firenvim" pkgs.vimPlugins.firenvim;
+
     settings = lib.mkOption {
       type = with lib.types; attrsOf anything;
       default = { };
diff --git a/modules/nixvim/plugins/legendary-nvim.nix b/modules/nixvim/plugins/legendary-nvim.nix
index 53efdb7c..cad05d9f 100644
--- a/modules/nixvim/plugins/legendary-nvim.nix
+++ b/modules/nixvim/plugins/legendary-nvim.nix
@@ -9,7 +9,7 @@ in
   options.plugins.legendary-nvim = {
     enable = lib.mkEnableOption "legendary.nvim";
 
-    package = helpers.mkPackageOption "legendary.nvim" pkgs.vimPlugins.legendary-nvim;
+    package = helpers.mkPluginPackageOption "legendary.nvim" pkgs.vimPlugins.legendary-nvim;
 
     additionalSetup = mkEnableOption' "dependencies for additional features like frecency sorting";
 
diff --git a/modules/nixvim/plugins/lush-nvim.nix b/modules/nixvim/plugins/lush-nvim.nix
index 4f221fd8..f87d027c 100644
--- a/modules/nixvim/plugins/lush-nvim.nix
+++ b/modules/nixvim/plugins/lush-nvim.nix
@@ -61,7 +61,7 @@ in
   options.colorschemes.lush = {
     enable = lib.mkEnableOption "theming with lush.nvim";
 
-    package = helpers.mkPackageOption "lush.nvim" pkgs.vimPlugins.lush-nvim;
+    package = helpers.mkPluginPackageOption "lush.nvim" pkgs.vimPlugins.lush-nvim;
 
     extraConfigLua = lib.mkOption {
       type = lib.types.lines;
diff --git a/modules/nixvim/plugins/nvim-config-local.nix b/modules/nixvim/plugins/nvim-config-local.nix
index d46e6d92..df1d61e9 100644
--- a/modules/nixvim/plugins/nvim-config-local.nix
+++ b/modules/nixvim/plugins/nvim-config-local.nix
@@ -8,7 +8,7 @@ in
     helpers.neovim-plugin.extraOptionsOptions // {
       enable = lib.mkEnableOption "nvim-config-local";
 
-      package = helpers.mkPackageOption "nvim-config-local" pkgs.vimPlugins.nvim-config-local;
+      package = helpers.mkPluginPackageOption "nvim-config-local" pkgs.vimPlugins.nvim-config-local;
 
       configFiles = lib.mkOption {
         type = with lib.types; listOf str;