Revert "helpers: add mkPackageOption + refactoring (#144)" (#149)

This reverts commit b724085447.
This commit is contained in:
Pedro Alves 2023-01-25 00:03:26 +00:00 committed by GitHub
parent b724085447
commit 2d54272177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 258 additions and 94 deletions

View file

@ -1,5 +1,5 @@
{ pkgs, lib, ... }@args:
with lib; with import ../helpers.nix { inherit lib; };
with lib; with import ../helpers.nix { lib = lib; };
mkPlugin args {
name = "ledger";
description = "Enable ledger language features";

View file

@ -1,6 +1,6 @@
{ lib, pkgs, ... }@attrs:
let
helpers = import ../helpers.nix { inherit lib; };
helpers = import ../helpers.nix { lib = lib; };
in with helpers; with lib;
mkPlugin attrs {
name = "nix";

View file

@ -7,7 +7,11 @@ with lib; {
options.plugins.plantuml-syntax = {
enable = mkEnableOption "plantuml syntax support";
package = helpers.mkPackageOption "plantuml-syntax" pkgs.vimPlugins.plantuml-syntax;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.plantuml-syntax;
description = "Plugin to use for plantuml-syntax";
};
setMakeprg = mkOption {
type = types.bool;

View file

@ -46,7 +46,11 @@ with lib; {
in
{
enable = mkEnableOption "rust tools plugins";
package = helpers.mkPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.rust-tools-nvim;
description = "Package to use for rust-tools";
};
serverPackage = mkOption {
type = types.package;
default = pkgs.rust-analyzer;

View file

@ -1,14 +1,17 @@
{ pkgs
, lib
, config
, helpers
, ...
}:
with lib; {
options.plugins.treesitter-context = {
enable = mkEnableOption "nvim-treesitter-context";
package = helpers.mkPackageOption "treesitter-context" pkgs.vimPlugins.nvim-treesitter-context;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-treesitter-context;
description = "Plugin to use for nvim-treesitter-context";
};
maxLines = mkOption {
type = types.nullOr types.ints.positive;

View file

@ -3,11 +3,7 @@
, lib
, ...
}:
with lib;
let
helpers = import ../helpers.nix { inherit lib; };
in
{
with lib; {
options.plugins.treesitter-refactor =
let
disable = mkOption {
@ -21,7 +17,11 @@ in
mkEnableOption
"treesitter-refactor (requires plugins.treesitter.enable to be true)";
package = helpers.mkPackageOption "treesitter-refactor" pkgs.vimPlugins.nvim-treesitter-refactor;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-treesitter-refactor;
description = "Plugin to use for treesitter-refactor";
};
highlightDefinitions = {
inherit disable;

View file

@ -1,6 +1,6 @@
{ lib, pkgs, ... }@attrs:
let
helpers = import ../helpers.nix { inherit lib; };
helpers = import ../helpers.nix { lib = lib; };
in with helpers; with lib;
mkPlugin attrs {
name = "zig";