From 29b8a373994ed96e0e6e8c6622ea89a29ab49f71 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 9 Sep 2025 15:59:01 +0200
Subject: [PATCH 1/3] maintainers: add sandydoo

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7acda00ceae6..0c83128df294 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22809,6 +22809,13 @@
     githubId = 96694484;
     name = "Sandeep Patel";
   };
+  sandydoo = {
+    name = "Sander";
+    github = "sandydoo";
+    githubId = 7572407;
+    email = "hey@sandydoo.me";
+    matrix = "@sandydoo:matrix.org";
+  };
   Sanskarzz = {
     email = "sanskar.gur@gmail.com";
     github = "Sanskarzz";

From 609d41c21ce77864853663d5c60e0bc51e4a27d1 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 9 Sep 2025 16:06:42 +0200
Subject: [PATCH 2/3] teams/cachix: init

---
 maintainers/team-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 979b687370ac..91a04b94836f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -168,6 +168,16 @@ with lib.maintainers;
     shortName = "c3d2";
   };
 
+  cachix = {
+    # Verify additions to this team with at least one existing member of the team.
+    members = [
+      domenkozar
+      sandydoo
+    ];
+    scope = "Group registration for packages maintained by Cachix.";
+    shortName = "Cachix employees";
+  };
+
   categorization = {
     members = [
       aleksana

From 1ba28dc2f49724ddebf2e59803c77a6a412963ca Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 9 Sep 2025 16:26:57 +0200
Subject: [PATCH 3/3] teams/cachix: inherit packages and modules

---
 nixos/modules/services/system/cachix-agent/default.nix | 2 +-
 nixos/modules/services/system/cachix-watch-store.nix   | 7 +++----
 pkgs/by-name/de/devenv/package.nix                     | 2 +-
 pkgs/by-name/se/secretspec/package.nix                 | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix
index b7da56d08981..e8fe84adfcf0 100644
--- a/nixos/modules/services/system/cachix-agent/default.nix
+++ b/nixos/modules/services/system/cachix-agent/default.nix
@@ -8,7 +8,7 @@ let
   cfg = config.services.cachix-agent;
 in
 {
-  meta.maintainers = [ lib.maintainers.domenkozar ];
+  meta.maintainers = lib.teams.cachix.members;
 
   options.services.cachix-agent = {
     enable = lib.mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";
diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix
index d9bd417d5d60..0df74b927afa 100644
--- a/nixos/modules/services/system/cachix-watch-store.nix
+++ b/nixos/modules/services/system/cachix-watch-store.nix
@@ -8,10 +8,9 @@ let
   cfg = config.services.cachix-watch-store;
 in
 {
-  meta.maintainers = [
-    lib.maintainers.jfroche
-    lib.maintainers.domenkozar
-  ];
+  meta = {
+    maintainers = lib.teams.cachix.members ++ [ lib.maintainers.jfroche ];
+  };
 
   options.services.cachix-watch-store = {
     enable = lib.mkEnableOption "Cachix Watch Store: <https://docs.cachix.org>";
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 5304121eaa18..ce11bfa06258 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -101,6 +101,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/cachix/devenv";
     license = lib.licenses.asl20;
     mainProgram = "devenv";
-    maintainers = with lib.maintainers; [ domenkozar ];
+    teams = [ lib.teams.cachix ];
   };
 }
diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index fe25907c5b31..5ff4debea656 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Declarative secrets, every environment, any provider";
     homepage = "https://secretspec.dev";
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ domenkozar ];
+    teams = [ lib.teams.cachix ];
     mainProgram = "secretspec";
   };
 })