develop #16

Merged
sid merged 4 commits from develop into release-25.11 2026-04-03 16:46:17 +02:00
Showing only changes of commit 954e6182e1 - Show all commits

View file

@ -51,11 +51,13 @@ in
options.stylix = { options.stylix = {
scheme = lib.mkOption { scheme = lib.mkOption {
type = types.str; type = types.nullOr types.str;
default = "dracula"; default = "dracula";
description = '' description = ''
Base16 color scheme name. Available options are: Base16 color scheme name. Available options are:
${toString validSchemes} ${toString validSchemes}
Set to `null` to generate a color scheme from `stylix.image`
''; '';
}; };
}; };
@ -66,11 +68,15 @@ in
assertion = builtins.elem cfg.scheme validSchemes; assertion = builtins.elem cfg.scheme validSchemes;
message = "Stylix: Invalid colorscheme '${cfg.scheme}'. Available options: ${toString validSchemes}"; message = "Stylix: Invalid colorscheme '${cfg.scheme}'. Available options: ${toString validSchemes}";
} }
{
assertion = (cfg.scheme != null) || (cfg.image != null);
message = "Stylix: You need to set stylix.image if stylix.scheme is `null`";
}
]; ];
stylix = { stylix = {
autoEnable = mkDefault true; autoEnable = mkDefault true;
base16Scheme = scheme; base16Scheme = mkIf (cfg.scheme != null) scheme;
fonts = { fonts = {
monospace = mkDefault { monospace = mkDefault {
package = pkgs.hack-font; package = pkgs.hack-font;