lol

nixos/fonts: rename fonts.enableDefaultFonts to fonts.enableDefaultPackages

to better fit the renamed fonts.packages

+12 -11
+1 -1
nixos/doc/manual/release-notes/rl-2311.section.md
··· 121 121 122 122 - `buildGoModule` `go-modules` attrs have been renamed to `goModules`. 123 123 124 - - The `fonts.fonts` option has been renamed to `fonts.packages`. 124 + - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. 125 125 126 126 - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. 127 127
+3 -2
nixos/modules/config/fonts/packages.nix
··· 6 6 { 7 7 imports = [ 8 8 (lib.mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.packages = [ pkgs.corefonts ]; instead.") 9 + (lib.mkRenamedOptionModule [ "fonts" "enableDefaultFonts " ] [ "fonts" "enableDefaultPackages" ]) 9 10 (lib.mkRenamedOptionModule [ "fonts" "fonts" ] [ "fonts" "packages" ]) 10 11 ]; 11 12 ··· 18 19 description = lib.mdDoc "List of primary font packages."; 19 20 }; 20 21 21 - enableDefaultFonts = lib.mkOption { 22 + enableDefaultPackages = lib.mkOption { 22 23 type = lib.types.bool; 23 24 default = false; 24 25 description = lib.mdDoc '' ··· 30 31 }; 31 32 32 33 config = { 33 - fonts.packages = lib.mkIf cfg.enableDefaultFonts (with pkgs; [ 34 + fonts.packages = lib.mkIf cfg.enableDefaultPackages (with pkgs; [ 34 35 dejavu_fonts 35 36 freefont_ttf 36 37 gyre-fonts # TrueType substitutes for standard PostScript fonts
+1 -1
nixos/modules/programs/hyprland.nix
··· 60 60 config = mkIf cfg.enable { 61 61 environment.systemPackages = [ cfg.finalPackage ]; 62 62 63 - fonts.enableDefaultFonts = mkDefault true; 63 + fonts.enableDefaultPackages = mkDefault true; 64 64 hardware.opengl.enable = mkDefault true; 65 65 66 66 programs = {
+1 -1
nixos/modules/programs/miriway.nix
··· 66 66 }; 67 67 68 68 hardware.opengl.enable = lib.mkDefault true; 69 - fonts.enableDefaultFonts = lib.mkDefault true; 69 + fonts.enableDefaultPackages = lib.mkDefault true; 70 70 programs.dconf.enable = lib.mkDefault true; 71 71 programs.xwayland.enable = lib.mkDefault true; 72 72
+1 -1
nixos/modules/programs/wayland/wayland-session.nix
··· 5 5 }; 6 6 7 7 hardware.opengl.enable = mkDefault true; 8 - fonts.enableDefaultFonts = mkDefault true; 8 + fonts.enableDefaultPackages = mkDefault true; 9 9 10 10 programs = { 11 11 dconf.enable = mkDefault true;
+1 -1
nixos/modules/services/networking/xrdp.nix
··· 121 121 icons.enable = true; 122 122 }; 123 123 124 - fonts.enableDefaultFonts = mkDefault true; 124 + fonts.enableDefaultPackages = mkDefault true; 125 125 126 126 systemd = { 127 127 services.xrdp = {
+1 -1
nixos/modules/services/x11/xserver.nix
··· 883 883 ${cfg.extraConfig} 884 884 ''; 885 885 886 - fonts.enableDefaultFonts = mkDefault true; 886 + fonts.enableDefaultPackages = mkDefault true; 887 887 fonts.packages = [ 888 888 (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) 889 889 pkgs.xorg.fontmiscmisc
+1 -1
nixos/tests/fontconfig-default-fonts.nix
··· 7 7 ]; 8 8 9 9 nodes.machine = { config, pkgs, ... }: { 10 - fonts.enableDefaultFonts = true; # Background fonts 10 + fonts.enableDefaultPackages = true; # Background fonts 11 11 fonts.packages = with pkgs; [ 12 12 noto-fonts-emoji 13 13 cantarell-fonts
+1 -1
nixos/tests/noto-fonts-cjk-qt-default-weight.nix
··· 5 5 nodes.machine = { 6 6 imports = [ ./common/x11.nix ]; 7 7 fonts = { 8 - enableDefaultFonts = false; 8 + enableDefaultPackages = false; 9 9 fonts = [ pkgs.noto-fonts-cjk-sans ]; 10 10 }; 11 11 };
+1 -1
nixos/tests/noto-fonts.nix
··· 6 6 imports = [ ./common/x11.nix ]; 7 7 environment.systemPackages = [ pkgs.gedit ]; 8 8 fonts = { 9 - enableDefaultFonts = false; 9 + enableDefaultPackages = false; 10 10 fonts = with pkgs;[ 11 11 noto-fonts 12 12 noto-fonts-cjk-sans