diff --git a/modules/packages/podman.nix b/modules/packages/podman.nix index 6782dce..de68815 100644 --- a/modules/packages/podman.nix +++ b/modules/packages/podman.nix @@ -9,11 +9,6 @@ }; environment.systemPackages = with pkgs; [ - podman - podman-compose podman-tui - passt - shadow - slirp4netns ]; } \ No newline at end of file diff --git a/modules/services/lib.nix b/modules/services/lib.nix index 35ff320..ed1403c 100644 --- a/modules/services/lib.nix +++ b/modules/services/lib.nix @@ -106,15 +106,15 @@ with lib; onFailure = [ "service-failure-notify@%n.service" ]; startLimitBurst = 5; startLimitIntervalSec = 600; - path = [ pkgs.podman pkgs.podman-compose pkgs.su pkgs.sudo pkgs.shadow pkgs.coreutils ]; + path = [ pkgs.coreutils ]; serviceConfig = { TimeoutStartSec = "1000"; ExecStartPre = [ "${pkgs.bash}/bin/bash -c 'sleep $((RANDOM % ${toString startDelay}))'" - "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose -f /etc/podman/${name}/compose.yaml pull" + "/run/wrappers/bin/podman-compose -f /etc/podman/${name}/compose.yaml pull" ]; - ExecStart = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans"; - ExecStop = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down"; + ExecStart = "/run/wrappers/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans"; + ExecStop = "/run/wrappers/bin/podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down"; Restart = "on-failure"; RestartSec = "3m"; };