modules/{taskwarrior,yt}: Move the `lib.mkIf cfg.enable` to the config

Having it only in the inner attributes is error prone.

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/by-name/ta/taskwarrior/module.nix b/modules/by-name/ta/taskwarrior/module.nix
index d8129bdc..d40456e2 100644
--- a/modules/by-name/ta/taskwarrior/module.nix
+++ b/modules/by-name/ta/taskwarrior/module.nix
@@ -105,7 +105,7 @@ in {
     };
   };
 
-  config = {
+  config = lib.mkIf cfg.enable {
     lib.taskwarrior = {
       inherit mkHook;
     };
@@ -115,16 +115,16 @@ in {
       "~/.local/share/task"
     ];
 
-    age.secrets.taskwarrior_sync_server_encryption_key = lib.mkIf (cfg.enable && cfg.enableAge) {
+    age.secrets.taskwarrior_sync_server_encryption_key = lib.mkIf (cfg.enableAge) {
       file = ./secrets/sync_server_encryption_key.age;
       mode = "700";
       owner = "soispha";
       group = "users";
     };
 
-    soispha.programs.taskwarrior.includeFiles.syncServerSecret = lib.mkIf (cfg.enable && cfg.enableAge) config.age.secrets.taskwarrior_sync_server_encryption_key.path;
+    soispha.programs.taskwarrior.includeFiles.syncServerSecret = lib.mkIf (cfg.enableAge) config.age.secrets.taskwarrior_sync_server_encryption_key.path;
 
-    home-manager.users.soispha = lib.mkIf cfg.enable {
+    home-manager.users.soispha = {
       services.taskwarrior-sync = lib.mkIf cfg.enableAge {
         enable = true;
         package = pkgs.taskwarrior3;
diff --git a/modules/by-name/yt/yt/module.nix b/modules/by-name/yt/yt/module.nix
index f001c030..40890d09 100644
--- a/modules/by-name/yt/yt/module.nix
+++ b/modules/by-name/yt/yt/module.nix
@@ -111,8 +111,8 @@ in {
     enable = lib.mkEnableOption "the yt cli client";
   };
 
-  config = {
-    home-manager.users.soispha = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
+    home-manager.users.soispha = {
       home.packages = [
         pkgs.yt
       ];