From fbc5e78b9c1f67b36d4a5087449dc87430ce6100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20C=2E?= <raphcatarino@gmail.com>
Date: Mon, 13 Oct 2025 16:27:23 +0200
Subject: [PATCH 1/2] nixos/gitwatch: add message option

---
 nixos/modules/services/monitoring/gitwatch.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/gitwatch.nix b/nixos/modules/services/monitoring/gitwatch.nix
index 076114a6ef11..7ec5f40a7f36 100644
--- a/nixos/modules/services/monitoring/gitwatch.nix
+++ b/nixos/modules/services/monitoring/gitwatch.nix
@@ -21,6 +21,7 @@ let
         getvar = flag: var: optionalString (cfg."${var}" != null) "${flag} ${cfg."${var}"}";
         branch = getvar "-b" "branch";
         remote = getvar "-r" "remote";
+        message = getvar "-m" "message";
       in
       rec {
         inherit (cfg) enable;
@@ -37,7 +38,7 @@ let
           if [ -n "${cfg.remote}" ] && ! [ -d "${cfg.path}" ]; then
             git clone ${branch} "${cfg.remote}" "${cfg.path}"
           fi
-          gitwatch ${remote} ${branch} ${cfg.path}
+          gitwatch ${remote} ${message} ${branch} ${cfg.path}
         '';
         serviceConfig.User = cfg.user;
       }
@@ -56,6 +57,7 @@ in
         user = "user";
         path = "/home/user/watched-project";
         remote = "git@github.com:me/my-project.git";
+        message = "Auto-commit by gitwatch on %d";
       };
       disabled-repo = {
         enable = false;
@@ -84,6 +86,11 @@ in
             type = nullOr str;
             default = null;
           };
+          message = lib.mkOption {
+            description = "Optional text to use in as commit message; all occurrences of `%d` will be replaced by formatted date/time";
+            type = nullOr str;
+            default = null;
+          };
           branch = mkOption {
             description = "Optional branch in remote repository";
             type = nullOr str;

From 024fd0a28ca715f1d52296d0ff54ae0050f72579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20C=2E?= <raphcatarino@gmail.com>
Date: Mon, 13 Oct 2025 16:28:34 +0200
Subject: [PATCH 2/2] nixos/gitwatch: add zareix as maintainers

---
 maintainers/maintainer-list.nix                | 6 ++++++
 nixos/modules/services/monitoring/gitwatch.nix | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 913ad6e09d50..7d4a1231b5e9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28817,6 +28817,12 @@
     githubId = 450885;
     name = "Francesco Zanini";
   };
+  zareix = {
+    email = "contact@raphael-catarino.fr";
+    github = "zareix";
+    githubId = 29818713;
+    name = "Raphaël Catarino";
+  };
   zarelit = {
     email = "david@zarel.net";
     github = "zarelit";
diff --git a/nixos/modules/services/monitoring/gitwatch.nix b/nixos/modules/services/monitoring/gitwatch.nix
index 7ec5f40a7f36..3cb493378ffe 100644
--- a/nixos/modules/services/monitoring/gitwatch.nix
+++ b/nixos/modules/services/monitoring/gitwatch.nix
@@ -100,5 +100,8 @@ in
       });
   };
   config.systemd.services = mapAttrs' mkSystemdService config.services.gitwatch;
-  meta.maintainers = with maintainers; [ shved ];
+  meta.maintainers = with maintainers; [
+    shved
+    zareix
+  ];
 }