From 8e588f81eb75428deec973217faff289af94612a Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 13 Feb 2026 04:07:03 -0800
Subject: [PATCH] nixos: fix oci-containers Restart conflict for org-agenda-api

---
 nixos/org-agenda-api-host.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/org-agenda-api-host.nix b/nixos/org-agenda-api-host.nix
index aa937720..73b33722 100644
--- a/nixos/org-agenda-api-host.nix
+++ b/nixos/org-agenda-api-host.nix
@@ -151,7 +151,9 @@ in
     # Ensure container restarts on failure
     systemd.services.podman-org-agenda-api = {
       serviceConfig = {
-        Restart = "always";
+        # oci-containers also sets Restart; use mkForce to avoid an option merge
+        # conflict when both are present.
+        Restart = lib.mkForce "always";
         RestartSec = "10s";
       };
     };