diff options
| author | Emily <vcs@emily.moe> | 2023-08-03 02:11:40 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2024-06-13 11:56:58 +0100 |
| commit | 7d4f8672101536674ca5d75d91161474739a83e2 (patch) | |
| tree | f3f01b95659e6b65ade816b8c9b7124b6f4e151b /modules | |
| parent | adf578e398445f981a36ad919928f23a1dd5ee12 (diff) | |
fonts: remove `fonts.fontDir.enable`
As far as I can tell, this isn't required to get fonts to work on
NixOS, so we shouldn't require it on nix-darwin either, even if the
implementations are superficially similar.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/fonts/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index 9ecb6eb..b0bd63f 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -6,7 +6,8 @@ in { imports = [ - (lib.mkRenamedOptionModule [ "fonts" "enableFontDir" ] [ "fonts" "fontDir" "enable" ]) + (lib.mkRemovedOptionModule [ "fonts" "enableFontDir" ] "No nix-darwin equivalent to this NixOS option. This is not required to install fonts.") + (lib.mkRemovedOptionModule [ "fonts" "fontDir" "enable" ] "No nix-darwin equivalent to this NixOS option. This is not required to install fonts.") (lib.mkRemovedOptionModule [ "fonts" "fonts" ] '' This option has been renamed to `fonts.packages' for consistency with NixOS. @@ -14,21 +15,12 @@ in ]; options = { - fonts.fontDir.enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable font management and install configured fonts to - {file}`/Library/Fonts/Nix Fonts`. - ''; - }; - fonts.packages = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; example = lib.literalExpression "[ pkgs.dejavu_fonts ]"; description = '' - List of fonts to install. + List of fonts to install into {file}`/Library/Fonts/Nix Fonts`. ''; }; }; @@ -52,7 +44,7 @@ in ) ''; - system.activationScripts.fonts.text = lib.optionalString cfg.fontDir.enable '' + system.activationScripts.fonts.text = '' printf >&2 'setting up /Library/Fonts/Nix Fonts...\n' # rsync uses the mtime + size of files to determine whether they |
