diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix index f1830bf59..b1f5ee3cc 100644 --- a/modules/misc/fontconfig.nix +++ b/modules/misc/fontconfig.nix @@ -14,8 +14,6 @@ let cfg = config.fonts.fontconfig; - inherit (config.home) profileDirectory; - globalConfig = config; fontConfigFileType = lib.types.submodule ( { name, ... }: @@ -298,8 +296,8 @@ in ${config.home.path}/lib/X11/fonts ${config.home.path}/share/fonts - ${profileDirectory}/lib/X11/fonts - ${profileDirectory}/share/fonts + ${config.home.profileDirectory}/lib/X11/fonts + ${config.home.profileDirectory}/share/fonts ${config.home.path}/lib/fontconfig/cache ''; diff --git a/tests/modules/misc/fontconfig/default.nix b/tests/modules/misc/fontconfig/default.nix index 314334a20..a7828fceb 100644 --- a/tests/modules/misc/fontconfig/default.nix +++ b/tests/modules/misc/fontconfig/default.nix @@ -7,6 +7,7 @@ fontconfig-default-rendering = ./default-rendering.nix; fontconfig-custom-rendering = ./custom-rendering.nix; fontconfig-extra-config-files = ./extra-config-files.nix; + fontconfig-fonts = ./fonts.nix; fontconfig-old-default-configFile-toggle = ./old-default-configFile-toggle.nix; } diff --git a/tests/modules/misc/fontconfig/fonts.nix b/tests/modules/misc/fontconfig/fonts.nix new file mode 100644 index 000000000..120c59eee --- /dev/null +++ b/tests/modules/misc/fontconfig/fonts.nix @@ -0,0 +1,33 @@ +{ config, pkgs, ... }: + +let + configFile = "home-files/.config/fontconfig/conf.d/10-hm-fonts.conf"; +in +{ + fonts.fontconfig.enable = true; + + nmt.script = '' + assertFileExists ${configFile} + assertFileContent ${configFile} ${pkgs.writeText "fonts.conf" '' + + + + + + + Add fonts in the Nix user profile + + ${config.home.path}/etc/fonts/conf.d + ${config.home.path}/etc/fonts/fonts.conf + + ${config.home.path}/lib/X11/fonts + ${config.home.path}/share/fonts + ${config.home.profileDirectory}/lib/X11/fonts + ${config.home.profileDirectory}/share/fonts + + ${config.home.path}/lib/fontconfig/cache + + + ''} + ''; +}