voronind/nix
0
0
Fork 0
Code Issues 41 Pull requests Packages Projects Releases Wiki Activity

Style: Fix android build.

Browse source
This commit is contained in:
Dmitry Voronin 2024-12-28 11:35:57 +03:00
parent 8f00269caf
commit f926b3bc63
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
option/Wallpaper.nix
View file

@ -30,7 +30,13 @@ in
};
style = lib.mkOption {
default = style;
type = with lib.types; nullOr (oneOf [ path lines attrs ]);
type =
with lib.types;
nullOr (oneOf [
path
lines
attrs
]);
};
};
}

51
system/Stylix.nix
View file

@ -4,43 +4,38 @@ let
wallpaper = config.module.wallpaper;
in
{
config = lib.mkMerge [
stylix =
{
stylix = {
inherit (config.module.style) cursor;
enable = true;
autoEnable = true;
image = wallpaper.path;
polarity = "dark";
fonts = with style.font; {
inherit
emoji
monospace
sansSerif
serif
;
sizes = with size; {
inherit desktop terminal;
applications = application;
popups = popup;
};
};
opacity = with style.opacity; {
inherit (config.module.style) cursor;
enable = true;
autoEnable = true;
image = wallpaper.path;
polarity = "dark";
fonts = with style.font; {
inherit
emoji
monospace
sansSerif
serif
;
sizes = with size; {
inherit desktop terminal;
applications = application;
popups = popups;
popups = popup;
};
};
opacity = with style.opacity; {
inherit desktop terminal;
applications = application;
popups = popups;
};
}
(lib.mkIf wallpaper.forceContrastText {
stylix.override = {
// (lib.optionalAttrs wallpaper.forceContrastText {
override = {
base04 = lib.mkForce "000000";
base05 = lib.mkForce "ffffff";
base06 = lib.mkForce "ffffff";
};
})
(lib.mkIf (wallpaper.style != null) { stylix.base16Scheme = wallpaper.style; })
];
// (lib.optionalAttrs (wallpaper.style != null) { base16Scheme = wallpaper.style; });
}