commit b0c67b4b6e0d21fd47097886f5c21cfb6bf27aad · pyrox.dev/nixpkgs

+3 -1

doc/builders/packages/ibus.section.md

···

       34
       34
        
       On NixOS, it can be installed using the following expression:

     

       35
       35
        
       

     

       36
       36
        
       ```nix

     

       37
       37
       -
       { pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }

     

       37
       37
       +
       { pkgs, ... }: {

     

       38
       38
       +
         fonts.packages = with pkgs; [ noto-fonts-emoji ];

     

       39
       39
       +
       }

     

       38
       40
        
       ```

+2 -2

nixos/modules/config/fonts/fontconfig.nix

···

       42
       42
        
         # looking things up.

     

       43
       43
        
         makeCacheConf = { }:

     

       44
       44
        
           let

     

       45
       45
       -
             makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };

     

       45
       45
       +
             makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.packages; };

     

       46
       46
        
             cache     = makeCache pkgs.fontconfig;

     

       47
       47
        
             cache32   = makeCache pkgs.pkgsi686Linux.fontconfig;

     

       48
       48
        
           in

     
···

       51
       51
        
             <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>

     

       52
       52
        
             <fontconfig>

     

       53
       53
        
               <!-- Font directories -->

     

       54
       54
       -
               ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}

     

       54
       54
       +
               ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)}

     

       55
       55
        
               ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''

     

       56
       56
        
               <!-- Pre-generated font caches -->

     

       57
       57
        
               <cachedir>${cache}</cachedir>

+1 -1

nixos/modules/config/fonts/fontdir.nix

···

       9
       9
        
         x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''

     

       10
       10
        
           mkdir -p "$out/share/X11/fonts"

     

       11
       11
        
           font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'

     

       12
       12
       -
           find ${toString config.fonts.fonts} -regex "$font_regexp" \

     

       12
       12
       +
           find ${toString config.fonts.packages} -regex "$font_regexp" \

     

       13
       13
        
             -exec ln -sf -t "$out/share/X11/fonts" '{}' \;

     

       14
       14
        
           cd "$out/share/X11/fonts"

     

       15
       15
        
           ${optionalString cfg.decompressFonts ''

+1 -1

nixos/modules/config/fonts/ghostscript.nix

···

       26
       26
        
       

     

       27
       27
        
         config = mkIf config.fonts.enableGhostscriptFonts {

     

       28
       28
        
       

     

       29
       29
       -
           fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];

     

       29
       29
       +
           fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];

     

       30
       30
        
       

     

       31
       31
        
         };

     

       32
       32

+1 -1

nixos/modules/services/monitoring/munin.nix

···

       375
       375
        
       

     

       376
       376
        
           # Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if

     

       377
       377
        
           # it's not available.

     

       378
       378
       -
           fonts.fonts = [ pkgs.dejavu_fonts ];

     

       378
       378
       +
           fonts.packages = [ pkgs.dejavu_fonts ];

     

       379
       379
        
       

     

       380
       380
        
           systemd.timers.munin-cron = {

     

       381
       381
        
             description = "batch Munin master programs";

+1 -1

nixos/modules/services/ttys/kmscon.nix

···

       111
       111
        
       

     

       112
       112
        
           fonts = mkIf (cfg.fonts != null) {

     

       113
       113
        
             fontconfig.enable = true;

     

       114
       114
       -
             fonts = map (f: f.package) cfg.fonts;

     

       114
       114
       +
             packages = map (f: f.package) cfg.fonts;

     

       115
       115
        
           };

     

       116
       116
        
         };

     

       117
       117
        
       }

+1 -1

nixos/modules/services/x11/desktop-managers/budgie.nix

···

       156
       156
        
             ++ cfg.sessionPath;

     

       157
       157
        
       

     

       158
       158
        
           # Fonts.

     

       159
       159
       -
           fonts.fonts = mkDefault [

     

       159
       159
       +
           fonts.packages = mkDefault [

     

       160
       160
        
             pkgs.noto-fonts

     

       161
       161
        
             pkgs.hack-font

     

       162
       162
        
           ];

+1 -1

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       218
       218
        
             qt.style = "adwaita";

     

       219
       219
        
       

     

       220
       220
        
             # Default Fonts

     

       221
       221
       -
             fonts.fonts = with pkgs; [

     

       221
       221
       +
             fonts.packages = with pkgs; [

     

       222
       222
        
               source-code-pro # Default monospace font in 3.32

     

       223
       223
        
               ubuntu_font_family # required for default theme

     

       224
       224
        
             ];

+1 -1

nixos/modules/services/x11/desktop-managers/deepin.nix

···

       67
       67
        
             networking.networkmanager.enable = mkDefault true;

     

       68
       68
        
             programs.dconf.enable = mkDefault true;

     

       69
       69
        
       

     

       70
       70
       -
             fonts.fonts = with pkgs; [ noto-fonts ];

     

       70
       70
       +
             fonts.packages = with pkgs; [ noto-fonts ];

     

       71
       71
        
             xdg.mime.enable = true;

     

       72
       72
        
             xdg.menus.enable = true;

     

       73
       73
        
             xdg.icons.enable = true;

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       92
       92
        
       

     

       93
       93
        
           environment.etc."X11/xkb".source = xcfg.xkbDir;

     

       94
       94
        
       

     

       95
       95
       -
           fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

     

       95
       95
       +
           fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

     

       96
       96
        
       

     

       97
       97
        
           services.udisks2.enable = true;

     

       98
       98
        
           services.upower.enable = config.powerManagement.enable;

+1 -1

nixos/modules/services/x11/desktop-managers/gnome.nix

···

       432
       432
        
               isSystem = true;

     

       433
       433
        
             };

     

       434
       434
        
       

     

       435
       435
       -
             fonts.fonts = with pkgs; [

     

       435
       435
       +
             fonts.packages = with pkgs; [

     

       436
       436
        
               cantarell-fonts

     

       437
       437
        
               dejavu_fonts

     

       438
       438
        
               source-code-pro # Default monospace font in 3.32

+2 -2

nixos/modules/services/x11/desktop-managers/pantheon.nix

···

       265
       265
        
             qt.style = "adwaita";

     

       266
       266
        
       

     

       267
       267
        
             # Default Fonts

     

       268
       268
       -
             fonts.fonts = with pkgs; [

     

       268
       268
       +
             fonts.packages = with pkgs; [

     

       269
       269
        
               inter

     

       270
       270
        
               open-dyslexic

     

       271
       271
        
               open-sans

     
···

       306
       306
        
             ])) config.environment.pantheon.excludePackages;

     

       307
       307
        
       

     

       308
       308
        
             # needed by screenshot

     

       309
       309
       -
             fonts.fonts = [

     

       309
       309
       +
             fonts.packages = [

     

       310
       310
        
               pkgs.pantheon.elementary-redacted-script

     

       311
       311
        
             ];

     

       312
       312
        
           })

+1 -1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       332
       332
        
             # Enable GTK applications to load SVG icons

     

       333
       333
        
             services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];

     

       334
       334
        
       

     

       335
       335
       -
             fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ];

     

       335
       335
       +
             fonts.packages = with pkgs; [ cfg.notoPackage hack-font ];

     

       336
       336
        
             fonts.fontconfig.defaultFonts = {

     

       337
       337
        
               monospace = [ "Hack" "Noto Sans Mono" ];

     

       338
       338
        
               sansSerif = [ "Noto Sans" ];

+1 -1

nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix

···

       142
       142
        
             theme

     

       143
       143
        
           ];

     

       144
       144
        
       

     

       145
       145
       -
           fonts.fonts = [ font ];

     

       145
       145
       +
           fonts.packages = [ font ];

     

       146
       146
        
       

     

       147
       147
        
           environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf;

     

       148
       148
        
         };

+2 -2

nixos/modules/services/x11/xserver.nix

···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         fontsForXServer =

     

       25
       25
       -
           config.fonts.fonts ++

     

       25
       25
       +
           config.fonts.packages ++

     

       26
       26
        
           # We don't want these fonts in fonts.conf, because then modern,

     

       27
       27
        
           # fontconfig-based applications will get horrible bitmapped

     

       28
       28
        
           # Helvetica fonts.  It's better to get a substitution (like Nimbus

     
···

       884
       884
        
             '';

     

       885
       885
        
       

     

       886
       886
        
           fonts.enableDefaultFonts = mkDefault true;

     

       887
       887
       -
           fonts.fonts = [

     

       887
       887
       +
           fonts.packages = [

     

       888
       888
        
             (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)

     

       889
       889
        
             pkgs.xorg.fontmiscmisc

     

       890
       890
        
           ];

+1 -1

nixos/tests/cage.nix

···

       11
       11
        
         {

     

       12
       12
        
           imports = [ ./common/user-account.nix ];

     

       13
       13
        
       

     

       14
       14
       -
           fonts.fonts = with pkgs; [ dejavu_fonts ];

     

       14
       14
       +
           fonts.packages = with pkgs; [ dejavu_fonts ];

     

       15
       15
        
       

     

       16
       16
        
           services.cage = {

     

       17
       17
        
             enable = true;

+1 -1

nixos/tests/cups-pdf.nix

···

       4
       4
        
         nodes.machine = { pkgs, ... }: {

     

       5
       5
        
           imports = [ ./common/user-account.nix ];

     

       6
       6
        
           environment.systemPackages = [ pkgs.poppler_utils ];

     

       7
       7
       -
           fonts.fonts = [ pkgs.dejavu_fonts ];  # yields more OCR-able pdf

     

       7
       7
       +
           fonts.packages = [ pkgs.dejavu_fonts ];  # yields more OCR-able pdf

     

       8
       8
        
           services.printing.cups-pdf.enable = true;

     

       9
       9
        
           services.printing.cups-pdf.instances = {

     

       10
       10
        
             opt = {};

+1 -1

nixos/tests/fontconfig-default-fonts.nix

···

       8
       8
        
       

     

       9
       9
        
         nodes.machine = { config, pkgs, ... }: {

     

       10
       10
        
           fonts.enableDefaultFonts = true; # Background fonts

     

       11
       11
       -
           fonts.fonts = with pkgs; [

     

       11
       11
       +
           fonts.packages = with pkgs; [

     

       12
       12
        
             noto-fonts-emoji

     

       13
       13
        
             cantarell-fonts

     

       14
       14
        
             twitter-color-emoji

+1 -1

nixos/tests/miriway.nix

···

       83
       83
        
             };

     

       84
       84
        
           };

     

       85
       85
        
       

     

       86
       86
       -
           fonts.fonts = [ pkgs.inconsolata ];

     

       86
       86
       +
           fonts.packages = [ pkgs.inconsolata ];

     

       87
       87
        
         };

     

       88
       88
        
       

     

       89
       89
        
         enableOCR = true;

+1 -1

nixos/tests/sway.nix

···

       51
       51
        
             '';

     

       52
       52
        
           };

     

       53
       53
        
       

     

       54
       54
       -
           fonts.fonts = [ pkgs.inconsolata ];

     

       54
       54
       +
           fonts.packages = [ pkgs.inconsolata ];

     

       55
       55
        
       

     

       56
       56
        
           # Automatically configure and start Sway when logging in on tty1:

     

       57
       57
        
           programs.bash.loginShellInit = ''

+1 -1

nixos/tests/vscodium.nix

···

       8
       8
        
             environment.variables.NIXOS_OZONE_WL = "1";

     

       9
       9
        
             environment.variables.DISPLAY = "do not use";

     

       10
       10
        
       

     

       11
       11
       -
             fonts.fonts = with pkgs; [ dejavu_fonts ];

     

       11
       11
       +
             fonts.packages = with pkgs; [ dejavu_fonts ];

     

       12
       12
        
           };

     

       13
       13
        
           xorg = { pkgs, ... }: {

     

       14
       14
        
             imports = [ ./common/user-account.nix ./common/x11.nix ];

+1 -1

pkgs/tools/typesetting/tex/texlive/combine.nix

···

       103
       103
        
         passthru = {

     

       104
       104
        
           # This is set primarily to help find-tarballs.nix to do its job

     

       105
       105
        
           packages = pkgList.all;

     

       106
       106
       -
           # useful for inclusion in the `fonts.fonts` nixos option or for use in devshells

     

       106
       106
       +
           # useful for inclusion in the `fonts.packages` nixos option or for use in devshells

     

       107
       107
        
           fonts = "${texmfroot}/texmf-dist/fonts";

     

       108
       108
        
         };

     

       109
       109