fix(home): Move non-options to config
This commit is contained in:
parent
02b37ea980
commit
0b22f3b9ef
1 changed files with 25 additions and 6 deletions
|
@ -83,7 +83,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.marleyos.theme = {
|
options.marleyos.theme = {
|
||||||
colors = rec {
|
colors = {
|
||||||
default = mkOption {
|
default = mkOption {
|
||||||
type = with types; str;
|
type = with types; str;
|
||||||
default = "dark";
|
default = "dark";
|
||||||
|
@ -93,12 +93,19 @@ in
|
||||||
light = mkColorThemeOpt "light" "dawn";
|
light = mkColorThemeOpt "light" "dawn";
|
||||||
dark = mkColorThemeOpt "dark" "main";
|
dark = mkColorThemeOpt "dark" "main";
|
||||||
|
|
||||||
inherit (cfg.colors."${cfg.colors.default}") base;
|
base = mkOption {
|
||||||
inherit (cfg.colors."${cfg.colors.default}") flavor;
|
type = colorThemes;
|
||||||
inherit (cfg.colors."${cfg.colors.default}") accent;
|
};
|
||||||
|
flavor = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
};
|
||||||
|
accent = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
};
|
||||||
|
|
||||||
# HACK: Need to come up with a better solution
|
isRosePine = mkOption {
|
||||||
isRosePine = base == "rose-pine";
|
type = with types; bool;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
icons = mkOption {
|
icons = mkOption {
|
||||||
|
@ -115,6 +122,18 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
|
# colors
|
||||||
|
{
|
||||||
|
marleyos.theme.colors = rec {
|
||||||
|
inherit (cfg.colors."${cfg.colors.default}") base;
|
||||||
|
inherit (cfg.colors."${cfg.colors.default}") flavor;
|
||||||
|
inherit (cfg.colors."${cfg.colors.default}") accent;
|
||||||
|
|
||||||
|
# HACK: Need to come up with a better solution
|
||||||
|
isRosePine = base == "rose-pine";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
# icons
|
# icons
|
||||||
(mkIf (cfg.icons != null) {
|
(mkIf (cfg.icons != null) {
|
||||||
gtk = mkIf config.gtk.enable (mkDefault {
|
gtk = mkIf config.gtk.enable (mkDefault {
|
||||||
|
|
Loading…
Reference in a new issue