helpers: add mkPackageOption + refactoring (#144) (#150)

This commit is contained in:
Gaétan Lepage 2023-01-25 19:46:49 +01:00 committed by GitHub
parent d8a86e9b3f
commit c73bef16ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 112 additions and 263 deletions

View file

@ -9,11 +9,7 @@ in
plugins.comment-nvim = {
enable = mkEnableOption "Enable comment-nvim";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.comment-nvim;
description = "Plugin to use for comment-nvim";
};
package = helpers.mkPackageOption "comment-nvim" pkgs.vimPlugins.comment-nvim;
padding = mkOption {
type = types.nullOr types.bool;

View file

@ -2,6 +2,7 @@
with lib;
let
cfg = config.plugins.commentary;
helpers = import ../helpers.nix { inherit lib; };
in
{
# TODO Add support for aditional filetypes. This requires autocommands!
@ -10,11 +11,7 @@ in
plugins.commentary = {
enable = mkEnableOption "commentary";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.vim-commentary;
description = "Plugin to use for vim-commentary";
};
package = helpers.mkPackageOption "commentary" pkgs.vimPlugins.vim-commentary;
};
};

View file

@ -10,11 +10,7 @@ in
plugins.dashboard = {
enable = mkEnableOption "dashboard";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.dashboard-nvim;
description = "Plugin to use for dashboard-nvim";
};
package = helpers.mkPackageOption "dashboard" pkgs.vimPlugins.dashboard-nvim;
header = mkOption {
description = "Header text";

View file

@ -9,11 +9,7 @@ in
plugins.easyescape = {
enable = mkEnableOption "Enable easyescape";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.vim-easyescape;
description = "Plugin to use for easyescape";
};
package = helpers.mkPackageOption "easyescape" pkgs.vimPlugins.vim-easyescape;
};
};
config = mkIf cfg.enable {

View file

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

View file

@ -9,11 +9,7 @@ in
plugins.floaterm = {
enable = mkEnableOption "floaterm";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.vim-floaterm;
description = "Plugin to use for floatterm";
};
package = helpers.mkPackageOption "floaterm" pkgs.vimPlugins.vim-floaterm;
shell = mkOption {
type = types.nullOr types.str;

View file

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

View file

@ -2,6 +2,7 @@
with lib;
let
cfg = config.plugins.intellitab;
helpers = import ../helpers.nix { inherit lib; };
defs = import ../plugin-defs.nix { inherit pkgs; };
in
{
@ -9,11 +10,7 @@ in
plugins.intellitab = {
enable = mkEnableOption "intellitab.nvim";
package = mkOption {
type = types.package;
default = defs.intellitab-nvim;
description = "Plugin to use for intellitab.nvim";
};
package = helpers.mkPackageOption "intellitab.nvim" defs.intellitab-nvim;
};
};

View file

@ -10,11 +10,7 @@ in
options.plugins.mark-radar = {
enable = mkEnableOption "mark-radar";
package = mkOption {
type = types.package;
default = defs.mark-radar;
description = "Plugin to use for mark-radar";
};
package = helpers.mkPackageOption "mark-radar" defs.mark-radar;
highlight_background = mkOption {
type = with types; nullOr bool;

View file

@ -2,7 +2,7 @@
with lib;
let
cfg = config.plugins.notify;
helpers = import ../helpers.nix { lib = lib; };
helpers = import ../helpers.nix { inherit lib; };
icon = mkOption {
type = types.nullOr types.str;
default = null;
@ -12,11 +12,7 @@ in
options.plugins.notify = {
enable = mkEnableOption "notify";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-notify;
description = "Plugin to use for notify";
};
package = helpers.mkPackageOption "notify" pkgs.vimPlugins.nvim-notify;
stages = mkOption {
type = types.nullOr (types.enum [ "fade_in_slide_out" "fade" "slide" "static" ]);

View file

@ -2,17 +2,13 @@
with lib;
let
cfg = config.plugins.nvim-autopairs;
helpers = import ../helpers.nix { lib = lib; };
helpers = import ../helpers.nix { inherit lib; };
in
{
options.plugins.nvim-autopairs = {
enable = mkEnableOption "nvim-autopairs";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-autopairs;
description = "Plugin to use for nvim-autopairs";
};
package = helpers.mkPackageOption "nvim-autopairs" pkgs.vimPlugins.nvim-autopairs;
pairs = mkOption {
type = types.nullOr (types.attrsOf types.str);

View file

@ -92,11 +92,7 @@ in
enable = mkEnableOption "nvim-colorizer";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-colorizer-lua;
description = "Plugin to use for vim-commentary";
};
package = helpers.mkPackageOption "nvim-colorizer" pkgs.vimPlugins.nvim-colorizer-lua;
fileTypes = mkOption {
description = "Enable and/or configure highlighting for certain filetypes";

View file

@ -2,7 +2,7 @@
with lib;
let
cfg = config.plugins.nvim-tree;
helpers = import ../helpers.nix { lib = lib; };
helpers = import ../helpers.nix { inherit lib; };
optionWarnings = import ../../lib/option-warnings.nix args;
basePluginPath = [ "plugins" "nvim-tree" ];
in
@ -21,11 +21,7 @@ in
options.plugins.nvim-tree = {
enable = mkEnableOption "nvim-tree";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nvim-tree-lua;
description = "Plugin to use for nvim-tree";
};
package = helpers.mkPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
disableNetrw = mkOption {
type = types.nullOr types.bool;

View file

@ -2,17 +2,13 @@
with lib;
let
cfg = config.plugins.project-nvim;
helpers = import ../helpers.nix { inherit lib; };
helpers = import ../helpers.nix { inherit lib pkgs; };
in
{
options.plugins.project-nvim = helpers.extraOptionsOptions // {
enable = mkEnableOption "project.nvim";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.project-nvim;
description = "Plugin to use for project-nvim";
};
package = helpers.mkPackageOption "project-nvim" pkgs.vimPlugins.project-nvim;
manualMode = mkOption {
type = types.nullOr types.bool;

View file

@ -8,11 +8,7 @@ in
options.plugins.specs = {
enable = mkEnableOption "specs-nvim";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.specs-nvim;
description = "Plugin to use for specs-nvim";
};
package = helpers.mkPackageOption "specs-nvim" pkgs.vimPlugins.specs-nvim;
show_jumps = mkOption {
type = types.bool;

View file

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

View file

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

View file

@ -9,11 +9,7 @@ in
plugins.undotree = {
enable = mkEnableOption "Enable undotree";
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.undotree;
description = "Plugin to use for undotree";
};
package = helpers.mkPackageOption "undotree" pkgs.vimPlugins.undotree;
windowLayout = mkOption {
type = types.nullOr types.int;