swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -121,7 +121,7 @@
- `buildGoModule` `go-modules` attrs have been renamed to `goModules`. - `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. - `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.

5
nixos/modules/config/fonts/packages.nix
View file

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

2
nixos/modules/programs/hyprland.nix
View file

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

2
nixos/modules/programs/miriway.nix
View file

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

2
nixos/modules/programs/wayland/wayland-session.nix
View file

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

2
nixos/modules/services/networking/xrdp.nix
View file

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

2
nixos/modules/services/x11/xserver.nix
View file

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

2
nixos/tests/fontconfig-default-fonts.nix
View file

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

2
nixos/tests/noto-fonts-cjk-qt-default-weight.nix
View file

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

2
nixos/tests/noto-fonts.nix
View file

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