Modules: Remove the options to disable paths and color modules
This commit is contained in:
@ -18,46 +18,45 @@ in {
|
||||
mkColorAssignment = defs: key: {${key} = defs.${key};};
|
||||
mkRgbColorAssignment = defs: key: {${key} = mylib.color.hexToRGB defs.${key};};
|
||||
mkRgbStringColorAssignment = defs: key: {${key} = mylib.color.hexToRGBString "," defs.${key};};
|
||||
in
|
||||
lib.mkIf color.enable {
|
||||
# This module sets its own options
|
||||
# to the values specified in a colorscheme file.
|
||||
modules.color = {
|
||||
hex = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
in {
|
||||
# This module sets its own options
|
||||
# to the values specified in a colorscheme file.
|
||||
modules.color = {
|
||||
hex = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
|
||||
rgb = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
rgb = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
|
||||
rgbString = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbStringColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
rgbString = {
|
||||
light = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbStringColorAssignment lightDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbStringColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
dark = lib.pipe colorKeys [
|
||||
(builtins.map (mkRgbStringColorAssignment darkDefs))
|
||||
lib.mergeAttrsList
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -5,8 +5,6 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; {
|
||||
enable = mkEnableOption "Enable color schemes";
|
||||
|
||||
lightScheme = mkOption {
|
||||
type = types.str;
|
||||
description = "The color scheme to use for light colors";
|
||||
|
@ -11,5 +11,5 @@ in {
|
||||
# The paths module doesn't use the "modules" namespace to keep the access shorter
|
||||
options.paths = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf paths.enable {};
|
||||
config = {};
|
||||
}
|
||||
|
@ -5,8 +5,6 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; {
|
||||
enable = mkEnableOption "paths";
|
||||
|
||||
nixflake = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
apply = toString;
|
||||
|
Reference in New Issue
Block a user