pyrox.dev / nixpkgs
lol
fork atom

Obsolete fonts.extraFonts

You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.

Eelco Dolstra e6b5c012 5ae8ed38

+29 -30
unified split
+1 -1
nixos/modules/config/fonts/corefonts.nix
··· 25 26 config = mkIf config.fonts.enableCoreFonts { 27 28 - fonts.extraFonts = [ pkgs.corefonts ]; 29 30 }; 31
··· 25 26 config = mkIf config.fonts.enableCoreFonts { 27 28 + fonts.fonts = [ pkgs.corefonts ]; 29 30 }; 31
+25 -27
nixos/modules/config/fonts/fonts.nix
··· 10 11 # TODO: find another name for it. 12 fonts = mkOption { 13 - default = [ 14 - # - the user's current profile 15 - "~/.nix-profile/lib/X11/fonts" 16 - "~/.nix-profile/share/fonts" 17 - # - the default profile 18 - "/nix/var/nix/profiles/default/lib/X11/fonts" 19 - "/nix/var/nix/profiles/default/share/fonts" 20 - ]; 21 - description = "List of primary font paths."; 22 - apply = list: list ++ [ 23 - # - a few statically built locations 24 - pkgs.xorg.fontbhttf 25 - pkgs.xorg.fontbhlucidatypewriter100dpi 26 - pkgs.xorg.fontbhlucidatypewriter75dpi 27 - pkgs.ttf_bitstream_vera 28 - pkgs.freefont_ttf 29 - pkgs.liberation_ttf 30 - pkgs.xorg.fontbh100dpi 31 - pkgs.xorg.fontmiscmisc 32 - pkgs.xorg.fontcursormisc 33 - ] 34 - ++ config.fonts.extraFonts; 35 - }; 36 - 37 - extraFonts = mkOption { 38 - default = []; 39 example = [ pkgs.dejavu_fonts ]; 40 - description = "List of packages with additional fonts."; 41 }; 42 43 }; 44 45 }; 46
··· 10 11 # TODO: find another name for it. 12 fonts = mkOption { 13 example = [ pkgs.dejavu_fonts ]; 14 + description = "List of primary font paths."; 15 + apply = list: list ++ 16 + [ # - the user's current profile 17 + "~/.nix-profile/lib/X11/fonts" 18 + "~/.nix-profile/share/fonts" 19 + # - the default profile 20 + "/nix/var/nix/profiles/default/lib/X11/fonts" 21 + "/nix/var/nix/profiles/default/share/fonts" 22 + ]; 23 }; 24 25 }; 26 + 27 + }; 28 + 29 + config = { 30 + 31 + fonts.fonts = 32 + [ pkgs.xorg.fontbhttf 33 + pkgs.xorg.fontbhlucidatypewriter100dpi 34 + pkgs.xorg.fontbhlucidatypewriter75dpi 35 + pkgs.ttf_bitstream_vera 36 + pkgs.freefont_ttf 37 + pkgs.liberation_ttf 38 + pkgs.xorg.fontbh100dpi 39 + pkgs.xorg.fontmiscmisc 40 + pkgs.xorg.fontcursormisc 41 + ]; 42 43 }; 44
+1 -1
nixos/modules/config/fonts/ghostscript.nix
··· 25 26 config = mkIf config.fonts.enableGhostscriptFonts { 27 28 - fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; 29 30 }; 31
··· 25 26 config = mkIf config.fonts.enableGhostscriptFonts { 27 28 + fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; 29 30 }; 31
+1
nixos/modules/rename.nix
··· 74 ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ] 75 ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ] 76 ++ obsolete [ "environment" "nix" ] [ "nix" "package" ] 77 78 ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ] 79 ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]
··· 74 ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ] 75 ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ] 76 ++ obsolete [ "environment" "nix" ] [ "nix" "package" ] 77 + ++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ] 78 79 ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ] 80 ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]
+1 -1
nixos/modules/services/x11/desktop-managers/gnome3.nix
··· 64 networking.networkmanager.enable = true; 65 services.upower.enable = config.powerManagement.enable; 66 67 - fonts.extraFonts = [ pkgs.dejavu_fonts ]; 68 69 services.xserver.desktopManager.session = singleton 70 { name = "gnome3";
··· 64 networking.networkmanager.enable = true; 65 services.upower.enable = config.powerManagement.enable; 66 67 + fonts.fonts = [ pkgs.dejavu_fonts ]; 68 69 services.xserver.desktopManager.session = singleton 70 { name = "gnome3";