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

@ -2,7 +2,6 @@
with lib;
let
cfg = config.colorschemes.base16;
helpers = import ../helpers.nix { inherit lib; };
themes = import ./base16-list.nix;
in
{
@ -10,7 +9,11 @@ in
colorschemes.base16 = {
enable = mkEnableOption "base16";
package = helpers.mkPackageOption "base16" pkgs.vimPlugins.base16-vim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.base16-vim;
description = "Plugin to use for base16";
};
useTruecolor = mkOption {
type = types.bool;

View file

@ -2,7 +2,6 @@
with lib;
let
cfg = config.colorschemes.gruvbox;
helpers = import ../helpers.nix { inherit lib; };
colors = types.enum [ "bg" "red" "green" "yellow" "blue" "purple" "aqua" "gray" "fg" "bg0_h" "bg0" "bg1" "bg2" "bg3" "bg4" "gray" "orange" "bg0_s" "fg0" "fg1" "fg2" "fg3" "fg4" ];
in
{
@ -10,7 +9,11 @@ in
colorschemes.gruvbox = {
enable = mkEnableOption "gruvbox";
package = helpers.mkPackageOption "gruvbox" pkgs.vimPlugins.gruvbox-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.gruvbox-nvim;
description = "Plugin to use for gruvbox";
};
italics = mkEnableOption "italics";
bold = mkEnableOption "bold";

View file

@ -2,14 +2,17 @@
with lib;
let
cfg = config.colorschemes.nord;
helpers = import ../helpers.nix { inherit lib; };
in
{
options = {
colorschemes.nord = {
enable = mkEnableOption "nord";
package = helpers.mkPackageOption "nord.vim" pkgs.vimPlugins.nord-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.nord-nvim;
description = "Plugin to use for nord.nvim";
};
contrast = mkEnableOption
"Make sidebars and popup menus like nvim-tree and telescope have a different background";

View file

@ -2,14 +2,17 @@
with lib;
let
cfg = config.colorschemes.one;
helpers = import ../helpers.nix { inherit lib; };
in
{
options = {
colorschemes.one = {
enable = mkEnableOption "vim-one";
package = helpers.mkPackageOption "one" pkgs.vimPlugins.vim-one;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.vim-one;
description = "Plugin to use for one";
};
};
};

View file

@ -8,7 +8,11 @@ in
colorschemes.onedark = {
enable = mkEnableOption "onedark";
package = helpers.mkPackageOption "one" pkgs.vimPlugins.onedark-vim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.onedark-vim;
description = "Plugin to use for one";
};
};
};

View file

@ -9,7 +9,11 @@ in
options = {
colorschemes.tokyonight = {
enable = mkEnableOption "tokyonight";
package = helpers.mkPackageOption "tokyonight" pkgs.vimPlugins.tokyonight-nvim;
package = mkOption {
type = types.package;
default = pkgs.vimPlugins.tokyonight-nvim;
description = "Plugin to use for tokyonight";
};
style = mkOption {
type = style;
default = "storm";