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

to better fit the renamed fonts.packages
This commit is contained in:
Sandro Jäckel 2023-07-24 17:33:39 +02:00
parent f9fdeb2dbc
commit 83793ca898
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
10 changed files with 12 additions and 11 deletions

View file

@ -121,7 +121,7 @@
- `buildGoModule` `go-modules` attrs have been renamed to `goModules`.
- The `fonts.fonts` option has been renamed to `fonts.packages`.
- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively.
- `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.

View file

@ -6,6 +6,7 @@ in
{
imports = [
(lib.mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.packages = [ pkgs.corefonts ]; instead.")
(lib.mkRenamedOptionModule [ "fonts" "enableDefaultFonts " ] [ "fonts" "enableDefaultPackages" ])
(lib.mkRenamedOptionModule [ "fonts" "fonts" ] [ "fonts" "packages" ])
];
@ -18,7 +19,7 @@ in
description = lib.mdDoc "List of primary font packages.";
};
enableDefaultFonts = lib.mkOption {
enableDefaultPackages = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
@ -30,7 +31,7 @@ in
};
config = {
fonts.packages = lib.mkIf cfg.enableDefaultFonts (with pkgs; [
fonts.packages = lib.mkIf cfg.enableDefaultPackages (with pkgs; [
dejavu_fonts
freefont_ttf
gyre-fonts # TrueType substitutes for standard PostScript fonts

View file

@ -60,7 +60,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.finalPackage ];
fonts.enableDefaultFonts = mkDefault true;
fonts.enableDefaultPackages = mkDefault true;
hardware.opengl.enable = mkDefault true;
programs = {

View file

@ -66,7 +66,7 @@ in {
};
hardware.opengl.enable = lib.mkDefault true;
fonts.enableDefaultFonts = lib.mkDefault true;
fonts.enableDefaultPackages = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
programs.xwayland.enable = lib.mkDefault true;

View file

@ -5,7 +5,7 @@
};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
fonts.enableDefaultPackages = mkDefault true;
programs = {
dconf.enable = mkDefault true;

View file

@ -121,7 +121,7 @@ in
icons.enable = true;
};
fonts.enableDefaultFonts = mkDefault true;
fonts.enableDefaultPackages = mkDefault true;
systemd = {
services.xrdp = {

View file

@ -883,7 +883,7 @@ in
${cfg.extraConfig}
'';
fonts.enableDefaultFonts = mkDefault true;
fonts.enableDefaultPackages = mkDefault true;
fonts.packages = [
(if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
pkgs.xorg.fontmiscmisc

View file

@ -7,7 +7,7 @@ import ./make-test-python.nix ({ lib, ... }:
];
nodes.machine = { config, pkgs, ... }: {
fonts.enableDefaultFonts = true; # Background fonts
fonts.enableDefaultPackages = true; # Background fonts
fonts.packages = with pkgs; [
noto-fonts-emoji
cantarell-fonts

View file

@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
nodes.machine = {
imports = [ ./common/x11.nix ];
fonts = {
enableDefaultFonts = false;
enableDefaultPackages = false;
fonts = [ pkgs.noto-fonts-cjk-sans ];
};
};

View file

@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.gedit ];
fonts = {
enableDefaultFonts = false;
enableDefaultPackages = false;
fonts = with pkgs;[
noto-fonts
noto-fonts-cjk-sans