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,12 +1,8 @@
{ pkgs
, config
, lib
, helpers
, ...
}:
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.plugins.telescope;
helpers = (import ../helpers.nix { inherit lib; });
in
{
imports = [
@ -22,7 +18,11 @@ in
options.plugins.telescope = {
enable = mkEnableOption "telescope.nvim";
package = helpers.mkPackageOption "telescope.nvim" pkgs.vimPlugins.telescope-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.telescope-nvim;
description = "Plugin to use for telescope.nvim";
};
highlightTheme = mkOption {
type = types.nullOr types.str;

View file

@ -7,7 +7,11 @@ in
options.plugins.telescope.extensions.frecency = {
enable = mkEnableOption "frecency";
package = helpers.mkPackageOption "telescope extension frecency" pkgs.vimPlugins.telescope-frecency-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.telescope-frecency-nvim;
description = "Plugin to use for telescope frecency";
};
dbRoot = mkOption {
type = types.nullOr types.str;

View file

@ -1,4 +1,4 @@
{ pkgs, config, lib, helpers, ... }:
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.plugins.telescope.extensions.fzf-native;
@ -7,7 +7,11 @@ in
options.plugins.telescope.extensions.fzf-native = {
enable = mkEnableOption "Enable fzf-native";
package = helpers.mkPackageOption "telescope extension fzf-native" pkgs.vimPlugins.telescope-fzf-native-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.telescope-fzf-native-nvim;
description = "Plugin to use for telescope extension fzf-native";
};
fuzzy = mkOption {
type = types.nullOr types.bool;

View file

@ -1,4 +1,4 @@
{ pkgs, config, lib, helpers, ... }:
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.plugins.telescope.extensions.media_files;
@ -7,7 +7,11 @@ in
options.plugins.telescope.extensions.media_files = {
enable = mkEnableOption "Enable media_files extension for telescope";
package = helpers.mkPackageOption "telescope extension media_files" pkgs.plugins.telescope-media-files-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.telescope-media-files-nvim;
description = "Plugin to use for telescope extension media_files";
};
filetypes = mkOption {
default = null;