ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

Obsolete fonts.extraFonts

Browse Source 
You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
This commit is contained in:
Eelco Dolstra 2014-04-29 12:25:47 +02:00
parent 5ae8ed381c
commit e6b5c0121f
5 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/fonts/corefonts.nix
View File

@ -25,7 +25,7 @@ with lib;
config = mkIf config.fonts.enableCoreFonts { config = mkIf config.fonts.enableCoreFonts {
fonts.extraFonts = [ pkgs.corefonts ]; fonts.fonts = [ pkgs.corefonts ];
}; };

32
nixos/modules/config/fonts/fonts.nix
View File

@ -10,18 +10,26 @@ with lib;
# TODO: find another name for it. # TODO: find another name for it.
fonts = mkOption { fonts = mkOption {
default = [ example = [ pkgs.dejavu_fonts ];
# - the user's current profile description = "List of primary font paths.";
apply = list: list ++
[ # - the user's current profile
"~/.nix-profile/lib/X11/fonts" "~/.nix-profile/lib/X11/fonts"
"~/.nix-profile/share/fonts" "~/.nix-profile/share/fonts"
# - the default profile # - the default profile
"/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/lib/X11/fonts"
"/nix/var/nix/profiles/default/share/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
};
config = {
fonts.fonts =
[ pkgs.xorg.fontbhttf
pkgs.xorg.fontbhlucidatypewriter100dpi pkgs.xorg.fontbhlucidatypewriter100dpi
pkgs.xorg.fontbhlucidatypewriter75dpi pkgs.xorg.fontbhlucidatypewriter75dpi
pkgs.ttf_bitstream_vera pkgs.ttf_bitstream_vera
@ -30,17 +38,7 @@ with lib;
pkgs.xorg.fontbh100dpi pkgs.xorg.fontbh100dpi
pkgs.xorg.fontmiscmisc pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc pkgs.xorg.fontcursormisc
] ];
++ config.fonts.extraFonts;
};
extraFonts = mkOption {
default = [];
example = [ pkgs.dejavu_fonts ];
description = "List of packages with additional fonts.";
};
};
}; };

2
nixos/modules/config/fonts/ghostscript.nix
View File

@ -25,7 +25,7 @@ with lib;
config = mkIf config.fonts.enableGhostscriptFonts { config = mkIf config.fonts.enableGhostscriptFonts {
fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
}; };

1
nixos/modules/rename.nix
View File

@ -74,6 +74,7 @@ in zipModules ([]
++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]
++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ] ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]
++ obsolete [ "environment" "nix" ] [ "nix" "package" ] ++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ] ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ] ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -64,7 +64,7 @@ in {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;
fonts.extraFonts = [ pkgs.dejavu_fonts ]; fonts.fonts = [ pkgs.dejavu_fonts ];
services.xserver.desktopManager.session = singleton services.xserver.desktopManager.session = singleton
{ name = "gnome3"; { name = "gnome3";