From c99bd9bedf7291390c28eddb31f8ed2aeec8ea7f Mon Sep 17 00:00:00 2001
From: Emilio Perez <emilio.perez-juarez@diamond.ac.uk>
Date: Tue, 1 Sep 2020 15:35:13 +0100
Subject: [PATCH] nixos/fontdir: add group of options for fontDir

Renaming enableFontDir to fontDir.enable
---
 nixos/modules/config/fonts/fontdir.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index 52fd2677d13..be06991063c 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" ])
+  ];
+
 }