diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 12:25:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 12:34:57 +0200 |
| commit | e6b5c0121f2cdaaf1e63b16c74337bb87aae42b2 (patch) | |
| tree | d780635cc81c65cac33407d909b33d3e36ab0303 /nixos/modules/config/fonts | |
| parent | 5ae8ed381c5439fb226d1d4f4dbbbf01f446f9a3 (diff) | |
Obsolete fonts.extraFonts
You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
Diffstat (limited to 'nixos/modules/config/fonts')
| -rw-r--r-- | nixos/modules/config/fonts/corefonts.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/fonts/fonts.nix | 52 | ||||
| -rw-r--r-- | nixos/modules/config/fonts/ghostscript.nix | 2 |
3 files changed, 27 insertions, 29 deletions
diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix index 51a6676fe4a0..ad7970879324 100644 --- a/nixos/modules/config/fonts/corefonts.nix +++ b/nixos/modules/config/fonts/corefonts.nix @@ -25,7 +25,7 @@ with lib; config = mkIf config.fonts.enableCoreFonts { - fonts.extraFonts = [ pkgs.corefonts ]; + fonts.fonts = [ pkgs.corefonts ]; }; diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index b6ec5c916955..ac804bef7fe4 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -10,38 +10,36 @@ with lib; # TODO: find another name for it. fonts = mkOption { - default = [ - # - the user's current profile - "~/.nix-profile/lib/X11/fonts" - "~/.nix-profile/share/fonts" - # - the default profile - "/nix/var/nix/profiles/default/lib/X11/fonts" - "/nix/var/nix/profiles/default/share/fonts" - ]; - description = "List of primary font paths."; - apply = list: list ++ [ - # - a few statically built locations - pkgs.xorg.fontbhttf - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.ttf_bitstream_vera - pkgs.freefont_ttf - pkgs.liberation_ttf - pkgs.xorg.fontbh100dpi - pkgs.xorg.fontmiscmisc - pkgs.xorg.fontcursormisc - ] - ++ config.fonts.extraFonts; - }; - - extraFonts = mkOption { - default = []; example = [ pkgs.dejavu_fonts ]; - description = "List of packages with additional fonts."; + description = "List of primary font paths."; + apply = list: list ++ + [ # - the user's current profile + "~/.nix-profile/lib/X11/fonts" + "~/.nix-profile/share/fonts" + # - the default profile + "/nix/var/nix/profiles/default/lib/X11/fonts" + "/nix/var/nix/profiles/default/share/fonts" + ]; }; }; }; + config = { + + fonts.fonts = + [ pkgs.xorg.fontbhttf + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.ttf_bitstream_vera + pkgs.freefont_ttf + pkgs.liberation_ttf + pkgs.xorg.fontbh100dpi + pkgs.xorg.fontmiscmisc + pkgs.xorg.fontcursormisc + ]; + + }; + } diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix index a41f00a76c57..1c62a525de94 100644 --- a/nixos/modules/config/fonts/ghostscript.nix +++ b/nixos/modules/config/fonts/ghostscript.nix @@ -25,7 +25,7 @@ with lib; config = mkIf config.fonts.enableGhostscriptFonts { - fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; + fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; |