Skip to content

stylix: simplify font options & use literalExpression default packages #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danth merged 2 commits into from
May 9, 2025
Merged

stylix: simplify font options & use literalExpression default packages #1225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d4530
stylix: use `literalExpression` for font package defaults
MattSturgeon May 4, 2025
66cb39c
stylix: simplify font options, removing submodules
MattSturgeon May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 27 additions & 35 deletions stylix/fonts.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,49 @@
let
cfg = config.stylix.fonts;

fontType = lib.types.submodule {
options = {
package = lib.mkOption {
description = "Package providing the font.";
type = lib.types.package;
mkFontOptions =
{
fontName,
displayName,
package,
}:
{
package = lib.mkPackageOption pkgs package { } // {
description = "Package providing the ${displayName} font.";
};

name = lib.mkOption {
description = "Name of the font within the package.";
type = lib.types.str;
description = "Name of the ${displayName} font.";
default = fontName;
};
};
};

in
{
options.stylix.fonts = {
serif = lib.mkOption {
description = "Serif font.";
type = fontType;
default = {
package = pkgs.dejavu_fonts;
name = "DejaVu Serif";
};
serif = mkFontOptions {
displayName = "Serif";
fontName = "DejaVu Serif";
package = "dejavu_fonts";
};

sansSerif = lib.mkOption {
description = "Sans-serif font.";
type = fontType;
default = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
sansSerif = mkFontOptions {
displayName = "Sans-serif";
fontName = "DejaVu Sans";
package = "dejavu_fonts";
};

monospace = lib.mkOption {
description = "Monospace font.";
type = fontType;
default = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans Mono";
};
monospace = mkFontOptions {
displayName = "Monospace";
fontName = "DejaVu Sans Mono";
package = "dejavu_fonts";
};

emoji = lib.mkOption {
description = "Emoji font.";
type = fontType;
default = {
package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji";
};
emoji = mkFontOptions {
displayName = "Emoji";
fontName = "Noto Color Emoji";
package = "noto-fonts-color-emoji";
};

sizes =
Expand Down