From b0c67b4b6e0d21fd47097886f5c21cfb6bf27aad Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Wed, 19 Jul 2023 13:43:36 +0200 Subject: treewide: rename fonts.fonts to fonts.packages --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- nixos/modules/services/x11/desktop-managers/deepin.nix | 2 +- nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- nixos/modules/services/x11/desktop-managers/pantheon.nix | 4 ++-- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- .../modules/services/x11/display-managers/lightdm-greeters/slick.nix | 2 +- nixos/modules/services/x11/xserver.nix | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'nixos/modules/services/x11') diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index b7341d4d8b49..a734bc288c9f 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -156,7 +156,7 @@ in { ++ cfg.sessionPath; # Fonts. - fonts.fonts = mkDefault [ + fonts.packages = mkDefault [ pkgs.noto-fonts pkgs.hack-font ]; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index c7755aca4bb5..b3cbe4c324df 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -218,7 +218,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ source-code-pro # Default monospace font in 3.32 ubuntu_font_family # required for default theme ]; diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 70be6ed7c05e..b2369e2426f8 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -67,7 +67,7 @@ in networking.networkmanager.enable = mkDefault true; programs.dconf.enable = mkDefault true; - fonts.fonts = with pkgs; [ noto-fonts ]; + fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; xdg.menus.enable = true; xdg.icons.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 2de5d845d68b..1512b5fdf8a0 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -92,7 +92,7 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; + fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 79b2e7c6ead7..5d950f7d7fc5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -432,7 +432,7 @@ in isSystem = true; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ cantarell-fonts dejavu_fonts source-code-pro # Default monospace font in 3.32 diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e87ae5ae8124..2b4ee516aa19 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -265,7 +265,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ inter open-dyslexic open-sans @@ -306,7 +306,7 @@ in ])) config.environment.pantheon.excludePackages; # needed by screenshot - fonts.fonts = [ + fonts.packages = [ pkgs.pantheon.elementary-redacted-script ]; }) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 38f932ffb420..15a510fd8f96 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -332,7 +332,7 @@ in # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; - fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ]; + fonts.packages = with pkgs; [ cfg.notoPackage hack-font ]; fonts.fontconfig.defaultFonts = { monospace = [ "Hack" "Noto Sans Mono" ]; sansSerif = [ "Noto Sans" ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 4456374cc569..ee9b4016c8ef 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -142,7 +142,7 @@ in theme ]; - fonts.fonts = [ font ]; + fonts.packages = [ font ]; environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 53d9c99b47d0..846434a71865 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -22,7 +22,7 @@ let }; fontsForXServer = - config.fonts.fonts ++ + config.fonts.packages ++ # We don't want these fonts in fonts.conf, because then modern, # fontconfig-based applications will get horrible bitmapped # Helvetica fonts. It's better to get a substitution (like Nimbus @@ -884,7 +884,7 @@ in ''; fonts.enableDefaultFonts = mkDefault true; - fonts.fonts = [ + fonts.packages = [ (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) pkgs.xorg.fontmiscmisc ]; -- cgit 1.4.1 From 83793ca8980283a6f62c028ebed336b9d1bbf80f Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Mon, 24 Jul 2023 17:33:39 +0200 Subject: nixos/fonts: rename fonts.enableDefaultFonts to fonts.enableDefaultPackages to better fit the renamed fonts.packages --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 +- nixos/modules/config/fonts/packages.nix | 5 +++-- nixos/modules/programs/hyprland.nix | 2 +- nixos/modules/programs/miriway.nix | 2 +- nixos/modules/programs/wayland/wayland-session.nix | 2 +- nixos/modules/services/networking/xrdp.nix | 2 +- nixos/modules/services/x11/xserver.nix | 2 +- nixos/tests/fontconfig-default-fonts.nix | 2 +- nixos/tests/noto-fonts-cjk-qt-default-weight.nix | 2 +- nixos/tests/noto-fonts.nix | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) (limited to 'nixos/modules/services/x11') diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 3fd8b5b6a2e5..95013c6aac15 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -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. diff --git a/nixos/modules/config/fonts/packages.nix b/nixos/modules/config/fonts/packages.nix index cedac766fc6e..8929539b921e 100644 --- a/nixos/modules/config/fonts/packages.nix +++ b/nixos/modules/config/fonts/packages.nix @@ -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 diff --git a/nixos/modules/programs/hyprland.nix b/nixos/modules/programs/hyprland.nix index d79680f63f16..faeaa8973fa9 100644 --- a/nixos/modules/programs/hyprland.nix +++ b/nixos/modules/programs/hyprland.nix @@ -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 = { diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix index a67e1a17a7e6..e8a10770b6a3 100644 --- a/nixos/modules/programs/miriway.nix +++ b/nixos/modules/programs/miriway.nix @@ -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; diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index 3cbfef4d61de..da117ceae0ad 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -5,7 +5,7 @@ }; hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; programs = { dconf.enable = mkDefault true; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index ed7f1dadd370..218b440aab3c 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -121,7 +121,7 @@ in icons.enable = true; }; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; systemd = { services.xrdp = { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 846434a71865..c2e6da4b453b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -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 diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index d422e3ccc41a..d8c6ea0f721b 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -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 diff --git a/nixos/tests/noto-fonts-cjk-qt-default-weight.nix b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix index 678013cf3ab9..c2e0cb3adaeb 100644 --- a/nixos/tests/noto-fonts-cjk-qt-default-weight.nix +++ b/nixos/tests/noto-fonts-cjk-qt-default-weight.nix @@ -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 ]; }; }; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 893522df24fe..edbb0db4cb7a 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -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 -- cgit 1.4.1