From e1ddf883006d850dd2d7b1b2b3e028c7fad1673e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <admin@numbus.eu>
Date: Tue, 3 Mar 2026 15:35:18 +0100
Subject: [PATCH] Try to fix newuidmap exec not found

---
 modules/services/lib.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/lib.nix b/modules/services/lib.nix
index 900a810..cec9166 100644
--- a/modules/services/lib.nix
+++ b/modules/services/lib.nix
@@ -106,18 +106,18 @@ with lib;
           onFailure = [ "service-failure-notify@%n.service" ];
           startLimitBurst = 5;
           startLimitIntervalSec = 600;
-          path = [ pkgs.podman pkgs.podman-compose pkgs.su pkgs.coreutils ];
+          path = [ pkgs.podman pkgs.podman-compose pkgs.su pkgs.shadow pkgs.coreutils ];
           serviceConfig = {
             Type = "exec";
             User = "numbus-admin";
             Group = "users";
             TimeoutStartSec = "1000";
             ExecStartPre = [
-              "/run/current-system/sw/bin/bash -c 'sleep $((RANDOM % ${toString startDelay}))'"
-              "/run/current-system/sw/bin/podman-compose -f /etc/podman/${name}/compose.yaml pull"
+              "${pkgs.bash}/bin/bash -c 'sleep $((RANDOM % ${toString startDelay}))'"
+              "${pkgs.podman-compose}/bin/podman-compose -f /etc/podman/${name}/compose.yaml pull"
             ];
-            ExecStart = "/run/current-system/sw/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans";
-            ExecStop = "/run/current-system/sw/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down";
+            ExecStart = "${pkgs.podman-compose}/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans";
+            ExecStop = "${pkgs.podman-compose}/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down";
             Restart = "on-failure";
             RestartSec = "3m";
           };