diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-05-24 17:25:19 +0300 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-20 16:55:07 +0000 |
commit | bd18e491a90adf3a103d808ddffd5c6fbb4622a5 (patch) | |
tree | 9abf5fe76c9f369993e3d334aa2bf549aca6ee19 /nixos/modules/config | |
parent | 7ab1f26bd41853f9c76a5d394871777cf8f41e4a (diff) | |
download | nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar.gz nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar.bz2 nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar.lz nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar.xz nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.tar.zst nixpkgs-bd18e491a90adf3a103d808ddffd5c6fbb4622a5.zip |
fontconfig service: drop dpi option
Recommend to use services.xserver.dpi option instead. Mention in the documentation that it's a sledgehammer approach and monitor settings should be used instead. Also don't set DPI in fontconfig settings; fontconfig should use Xft settings by default so let's not override one value in multiple places. For example, user now can set DPI via ~/.Xresources properly.
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 72827c5abaa..1e68fef7ce7 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -78,14 +78,6 @@ let </edit> </match> - ${optionalString (cfg.dpi != 0) '' - <match target="pattern"> - <edit name="dpi" mode="assign"> - <double>${toString cfg.dpi}</double> - </edit> - </match> - ''} - </fontconfig> ''; @@ -237,6 +229,7 @@ in (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") ] ++ lib.forEach [ "enable" "substitutions" "preset" ] (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' The fonts.fontconfig.ultimate module and configuration is obsolete. @@ -282,15 +275,6 @@ in ''; }; - dpi = mkOption { - type = types.int; - default = 0; - description = '' - Force DPI setting. Setting to <literal>0</literal> disables DPI - forcing; the DPI detected for the display will be used. - ''; - }; - localConf = mkOption { type = types.lines; default = ""; |