diff --git a/modules/nixos/hedgedoc.nix b/modules/nixos/hedgedoc.nix
index 934420d..6aa5de2 100644
--- a/modules/nixos/hedgedoc.nix
+++ b/modules/nixos/hedgedoc.nix
@@ -44,8 +44,8 @@ in
       };
     };
   };
-  config = {
-    services.hedgedoc = mkIf cfg.enable {
+  config = mkIf cfg.enable {
+    services.hedgedoc = {
       enable = true;
       environmentFile = cfg.environmentFile;
       settings = {
@@ -71,13 +71,13 @@ in
         defaultPermission = "private";
       };
     };
-    services.caddy = mkIf ( cfg.enable && cfg.enable ) {
+    services.caddy = mkIf cfg.caddy {
       enable = true;
       virtualHosts."https://${cfg.domain}".extraConfig = ''
         reverse_proxy unix/${config.services.hedgedoc.settings.path}
       '';
     };
-    users.users.caddy.extraGroups = mkIf ( cfg.enable && cfg.enable ) [ "hedgedoc" ];
+    users.users.caddy.extraGroups = mkIf cfg.caddy [ "hedgedoc" ];
 
   };
 }
diff --git a/modules/nixos/prometheus.nix b/modules/nixos/prometheus.nix
index 5234e76..9ddd255 100644
--- a/modules/nixos/prometheus.nix
+++ b/modules/nixos/prometheus.nix
@@ -25,7 +25,7 @@ in
     };
   };
 
-  config = mkMerge [{
+  config = mkIf cfg.enable (mkMerge [{
     services.caddy.globalConfig = ''
       servers {
         metrics
@@ -91,5 +91,5 @@ in
       })
     ];
   }
-  ];
+  ]);
 }
diff --git a/modules/nixos/restic.nix b/modules/nixos/restic.nix
index 178d599..07a8dad 100644
--- a/modules/nixos/restic.nix
+++ b/modules/nixos/restic.nix
@@ -16,8 +16,8 @@ in
       };
     };
   };
-  config = {
-    services.restic.backups = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
+    services.restic.backups = {
       remotebackup = {
         repositoryFile = cfg.repositoryFile;
         passwordFile = cfg.passwordFile;