summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2022-06-26 12:03:01 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-26 11:59:08 +0000
commit47421ff4e694f248aa7a50d77cfadc0188a9457b (patch)
tree9907544febc82f49abc75004d4ae945794375f51
parentMerge pull request #179106 from NixOS/backport-178486-to-release-22.05 (diff)
downloadnixpkgs-47421ff4e694f248aa7a50d77cfadc0188a9457b.tar.gz
nixos/fontconfig: add fonts.fontconfig.hinting.style option
(cherry picked from commit 659096dd89da4419200b917567f97906805b3131)
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix17
1 files changed, 15 insertions, 2 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 1e68fef7ce74..a10a8c6428a1 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -65,7 +65,7 @@ let
${fcBool cfg.hinting.autohint}
</edit>
<edit mode="append" name="hintstyle">
- <const>hintslight</const>
+ <const>${cfg.hinting.style}</const>
</edit>
<edit mode="append" name="antialias">
${fcBool cfg.antialias}
@@ -226,7 +226,6 @@ in
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
- (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
@@ -349,6 +348,20 @@ in
fonts, but better than unhinted fonts.
'';
};
+
+ style = mkOption {
+ type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ];
+ default = "hintslight";
+ description = ''
+ Hintstyle is the amount of font reshaping done to line up
+ to the grid.
+
+ hintslight will make the font more fuzzy to line up to the grid
+ but will be better in retaining font shape, while hintfull will
+ be a crisp font that aligns well to the pixel grid but will lose
+ a greater amount of font shape.
+ '';
+ };
};
includeUserConf = mkOption {