From 7506073727d96ecaa260f69d32f9138d43b825e6 Mon Sep 17 00:00:00 2001
From: Wateir <contact@wateir.fr>
Date: Wed, 24 Dec 2025 18:06:14 +0100
Subject: [PATCH] chore: Better use of boolean to activate service

---
 host/default.nix     | 4 ++--
 module/forgejo.nix   | 3 +--
 module/nginx.nix     | 4 ++--
 module/roundcube.nix | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/host/default.nix b/host/default.nix
index e240052..e63ea39 100644
--- a/host/default.nix
+++ b/host/default.nix
@@ -4,11 +4,11 @@ let
     ThinkCentre-Server-004 = {
       services.vaultwarden.enable  = true;
       services.tailscale.enable    = true;
-      module.roundcube.enable      = true;
+      services.roundcube.enable      = true;
       services.searx.enable        = true;
       module.acme.enable           = true;
       services.newt.enable         = true;
-      module.forgejo.enable        = true;
+      services.forgejo.enable        = true;
     };
   };
 in {
diff --git a/module/forgejo.nix b/module/forgejo.nix
index afec651..087f7d9 100644
--- a/module/forgejo.nix
+++ b/module/forgejo.nix
@@ -3,9 +3,8 @@ let
   cfg = config.services.forgejo;
   srv = cfg.settings.server;
 in
-lib.mkIf config.module.forgejo.enable {
+{
   services.forgejo = {
-    enable = true;
     database.type = "postgres";
     # Enable support for Git Large File Storage
     lfs.enable = true;
diff --git a/module/nginx.nix b/module/nginx.nix
index 70c2f2e..8ff1b36 100644
--- a/module/nginx.nix
+++ b/module/nginx.nix
@@ -21,7 +21,7 @@ with lib;
       };
     })
 
-    (mkIf config.module.roundcube.enable {
+    (mkIf config.services.roundcube.enable {
       "${config.module.hostName}-${config.module.roundcube.subdomain}" = {
         listen = [{ addr = "0.0.0.0"; port = config.module.roundcube.port; }];
         root = "${pkgs.roundcube}/public_html";
@@ -40,7 +40,7 @@ with lib;
         };
       };
     })
-    (mkIf config.module.forgejo.enable {
+    (mkIf config.services.forgejo.enable {
       "${config.module.hostName}-${config.module.forgejo.subdomain}" = {
         listen = [{ addr = "0.0.0.0"; port = config.module.forgejo.externalPort; }];
         locations."/" = {
diff --git a/module/roundcube.nix b/module/roundcube.nix
index 412a21c..b5f08ea 100644
--- a/module/roundcube.nix
+++ b/module/roundcube.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-lib.mkIf config.module.roundcube.enable {
+{
   age.secrets = {
     YfDrVBDJcVoYNZeJ = {
       file = ../secrets/cache/YfDrVBDJcVoYNZeJ;
@@ -12,7 +12,6 @@ lib.mkIf config.module.roundcube.enable {
 
 
   services.roundcube = {
-    enable = true;
     hostName = "${config.module.roundcube.subdomain}.${config.module.domain}";
 
     plugins = [ "multiple_accounts" ];