From a5c74762cbe96149673be60b0fcd51632642265e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 13 Nov 2018 10:28:40 +0000
Subject: [PATCH] nixos/cloud-init: add enable suffix to ext4/btrfs

Makes the optional more self-describing and allows future extensions
---
 nixos/modules/services/system/cloud-init.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 59f57307098b..f22bd45dfebc 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -10,15 +10,13 @@ let cfg = config.services.cloud-init;
       openssh
       shadow
       utillinux
-    ] ++ optional config.services.cloud-init.btrfs btrfs-progs
-      ++ optional config.services.cloud-init.ext4 e2fsprogs
+    ] ++ optional cfg.btrfs.enable btrfs-progs
+      ++ optional cfg.ext4.enable e2fsprogs
     ;
 in
 {
   options = {
-
     services.cloud-init = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -38,7 +36,7 @@ in
         '';
       };
 
-      btrfs = mkOption {
+      btrfs.enable = mkOption {
         type = types.bool;
         default = false;
         description = ''
@@ -46,7 +44,7 @@ in
         '';
       };
 
-      ext4 = mkOption {
+      ext4.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''