diff options
author | Emilio Perez <emilio.perez-juarez@diamond.ac.uk> | 2020-09-01 15:35:13 +0100 |
---|---|---|
committer | Emilio Perez <emilio.perez-juarez@diamond.ac.uk> | 2020-10-04 14:56:29 +0100 |
commit | c99bd9bedf7291390c28eddb31f8ed2aeec8ea7f (patch) | |
tree | 4ff8452a0f3b6839dd5389732c72a6c7d746a47b /nixos/modules/config | |
parent | eda7e23ea4c276e593bb399e552a5701a6e725f1 (diff) |
nixos/fontdir: add group of options for fontDir
Renaming enableFontDir to fontDir.enable
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/fonts/fontdir.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 52fd2677d13c0..be06991063c63 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -20,10 +20,9 @@ in { options = { + fonts.fontDir = { - fonts = { - - enableFontDir = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -32,11 +31,11 @@ in ''; }; - }; + }; }; - config = mkIf config.fonts.enableFontDir { + config = mkIf config.fonts.fontDir.enable { # This is enough to make a symlink because the xserver # module already links all /share/X11 paths. @@ -48,4 +47,8 @@ in }; + imports = [ + (mkRenamedOptionModule [ "fonts" "enableFontDir" ] [ "fonts" "fontDir" "enable" ]) + ]; + } |