From 40e141ae5a40157e7dc3f169acf8ebeecc733989 Mon Sep 17 00:00:00 2001
From: Mat Jones <mat@mjones.network>
Date: Thu, 15 Aug 2024 11:25:57 -0400
Subject: [PATCH] fix: restart opnix on nixos-rebuild

---
 modules/op-secrets.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/op-secrets.nix b/modules/op-secrets.nix
index b2b479d..5d5f62c 100644
--- a/modules/op-secrets.nix
+++ b/modules/op-secrets.nix
@@ -65,7 +65,12 @@ in {
       example = [ "homepage-dashboard" "wg-quick-vpn" ];
     };
   };
-  config = mkIf (cfg.secrets != { }) (mkMerge [
+  config = let
+    opnixScript = ''
+      ${scripts.installSecrets}
+      ${scripts.chownSecrets}
+    '';
+  in mkIf (cfg.secrets != { }) (mkMerge [
     {
       systemd.services.opnix = {
         wants = [ "network-online.target" ];
@@ -74,13 +79,19 @@ in {
         serviceConfig = {
           Type = "oneshot";
           EnvironmentFile = cfg.environmentFile;
-          Restart = "always";
         };
 
-        script = ''
-          ${scripts.installSecrets}
-          ${scripts.chownSecrets}
-        '';
+        script = opnixScript;
+      };
+
+      systemd.services.opnix-restart = {
+        wants = [ "network-online.target" ];
+        after = [ "sysinit-reactivation.target" ];
+        serviceConfig = {
+          Type = "oneshot";
+          EnvironmentFile = cfg.environmentFile;
+        };
+        script = opnixScript;
       };
     }
     {