From c498d0b9c92b5547b94834e6f5ca2216bb30fc35 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 7 Jan 2024 11:40:13 +0100 Subject: [PATCH] plugins/tagbar: switch to using mkPlugin --- plugins/languages/tagbar.nix | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/plugins/languages/tagbar.nix b/plugins/languages/tagbar.nix index e5cac593..fd24950b 100644 --- a/plugins/languages/tagbar.nix +++ b/plugins/languages/tagbar.nix @@ -1,32 +1,13 @@ { lib, - helpers, - config, pkgs, ... -}: let - cfg = config.plugins.tagbar; -in - with lib; { - options.plugins.tagbar = { - enable = mkEnableOption "tagbar"; - - package = helpers.mkPackageOption "tagbar" pkgs.vimPlugins.tagbar; - - extraConfig = helpers.mkNullOrOption types.attrs '' - The configuration options for tagbar without the 'tagbar_' prefix. - Example: To set 'tagbar_show_tag_count' to 1, write - extraConfig = { - show_tag_count = true; - }; - ''; - }; - - config = mkIf cfg.enable { - extraPlugins = [cfg.package]; - - extraPackages = [pkgs.ctags]; - - globals = mapAttrs' (name: nameValuePair ("tagbar_" + name)) cfg.extraConfig; - }; +} @ args: +with lib; +with import ../helpers.nix {inherit lib;}; + mkPlugin args { + name = "tagbar"; + package = pkgs.vimPlugins.tagbar; + globalPrefix = "tagbar_"; + extraPackages = [pkgs.ctags]; }