mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-30 04:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
plugins/utils/comment-nvim.nix
View file

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

7
plugins/utils/commentary.nix
View file

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

6
plugins/utils/dashboard.nix
View file

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

6
plugins/utils/easyescape.nix
View file

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

2
plugins/utils/endwise.nix
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 = "endwise";

6
plugins/utils/floaterm.nix
View file

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

2
plugins/utils/goyo.nix
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 = "goyo";

6
plugins/utils/intellitab.nix
View file

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

6
plugins/utils/mark-radar.nix
View file

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

8
plugins/utils/notify.nix
View file

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

8
plugins/utils/nvim-autopairs.nix
View file

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

6
plugins/utils/nvim-colorizer.nix
View file

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

8
plugins/utils/nvim-tree.nix
View file

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

8
plugins/utils/project-nvim.nix
View file

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

6
plugins/utils/specs.nix
View file

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

2
plugins/utils/startify.nix
View file

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

2
plugins/utils/surround.nix
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 = "surround";

6
plugins/utils/undotree.nix
View file

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