feat(sops-nix): use restartUnits

config/hosts/imxyy-nix-server/build.nix

@@ -7,6 +7,7 @@
 {
   sops.secrets.et-imxyy-nix-server-nixremote = {
     sopsFile = secrets.et-imxyy-nix-server-nixremote;
+    restartUnits = [ "easytier-nixremote.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];

config/hosts/imxyy-nix-server/efl.nix

@@ -2,6 +2,7 @@
 {
   sops.secrets.efl-tuwunel-env = {
     sopsFile = secrets.efl-tuwunel;
+    restartUnits = [ "podman-tuwunel.service" ];
     format = "dotenv";
   };
   virtualisation.oci-containers.containers = {

config/hosts/imxyy-nix-server/matrix.nix

@@ -9,12 +9,14 @@
   ];
   sops.secrets.tuwunel-reg-token = {
     sopsFile = secrets.tuwunel-reg-token;
+    restartUnits = [ "tuwunel.service" ];
     format = "binary";
     owner = config.services.matrix-tuwunel.user;
     group = config.services.matrix-tuwunel.group;
   };
   sops.secrets.tuwunel-turn-secret = {
     sopsFile = secrets.tuwunel-turn-secret;
+    restartUnits = [ "tuwunel.service" ];
     format = "binary";
     owner = config.services.matrix-tuwunel.user;
     group = config.services.matrix-tuwunel.group;
@@ -68,6 +70,7 @@
 
   sops.secrets.mautrix-telegram = {
     sopsFile = secrets.mautrix-telegram;
+    restartUnits = [ "mautrix-telegram.service" ];
     format = "dotenv";
     owner = "mautrix-telegram";
     group = "mautrix-telegram";

config/hosts/imxyy-nix-server/minio.nix

@@ -2,6 +2,7 @@
 {
   sops.secrets.minio-env = {
     sopsFile = secrets.minio;
+    restartUnits = [ "minio.service" ];
     format = "dotenv";
   };
   services.minio = {

config/hosts/imxyy-nix-server/net.nix

@@ -142,6 +142,7 @@
 
   sops.secrets.dae-imxyy-nix-server = {
     sopsFile = secrets.dae-imxyy-nix-server;
+    restartUnits = [ "dae.service" ];
     format = "binary";
   };
   services.dae = {
@@ -154,6 +155,7 @@
   };
   sops.secrets.mihomo = {
     sopsFile = secrets.mihomo;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -166,6 +168,7 @@
 
   sops.secrets.frp-env = {
     sopsFile = secrets.frp;
+    restartUnits = [ "frp.service" ];
     format = "dotenv";
   };
   systemd.services.frp.serviceConfig.EnvironmentFile = [
@@ -429,6 +432,7 @@
 
   sops.secrets.et-imxyy-nix-server = {
     sopsFile = secrets.et-imxyy-nix-server;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];

config/hosts/imxyy-nix-server/note.nix

@@ -4,11 +4,10 @@
   ...
 }:
 {
-  sops.secrets = {
+  sops.secrets.siyuan-env = {
-    siyuan-env = {
+    sopsFile = secrets.siyuan;
-      sopsFile = secrets.siyuan;
+    restartUnits = [ "siyuan.service" ];
-      format = "dotenv";
+    format = "dotenv";
-    };
   };
   virtualisation.oci-containers.containers = {
     siyuan = {

config/hosts/imxyy-nix-server/rss.nix

@@ -5,6 +5,7 @@ in
 {
   sops.secrets.rsshub-env = {
     sopsFile = secrets.rsshub;
+    restartUnits = [ "podman-rsshub.service" ];
     format = "dotenv";
   };
   users.users.rsshub = {

config/hosts/imxyy-nix-server/vault.nix

@@ -2,6 +2,7 @@
 {
   sops.secrets.vaultwarden-env = {
     sopsFile = secrets.vaultwarden;
+    restartUnits = [ "vaultwarden.service" ];
     format = "dotenv";
   };
   services.postgresql.ensureUsers = [

config/hosts/imxyy-nix-x16/net.nix

@@ -54,6 +54,7 @@
 
   sops.secrets.dae-imxyy-nix-x16 = {
     sopsFile = secrets.dae-imxyy-nix-x16;
+    restartUnits = [ "dae.service" ];
     format = "binary";
   };
   services.dae = {
@@ -63,6 +64,7 @@
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
     sopsFile = secrets.mihomo;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -75,6 +77,7 @@
 
   sops.secrets.et-imxyy-nix-x16 = {
     sopsFile = secrets.et-imxyy-nix-x16;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = with pkgs; [

config/hosts/imxyy-nix/net.nix

@@ -90,6 +90,7 @@
 
   sops.secrets.dae-imxyy-nix = {
     sopsFile = secrets.dae-imxyy-nix;
+    restartUnits = [ "dae.service" ];
     format = "binary";
   };
   services.dae = {
@@ -99,6 +100,7 @@
   systemd.services.dae.after = [ "sops-nix.service" ];
   sops.secrets.mihomo = {
     sopsFile = secrets.mihomo;
+    restartUnits = [ "mihomo.service" ];
     format = "yaml";
     key = "";
   };
@@ -111,6 +113,7 @@
 
   sops.secrets.et-imxyy-nix = {
     sopsFile = secrets.et-imxyy-nix;
+    restartUnits = [ "easytier.service" ];
     format = "binary";
   };
   environment.systemPackages = [ pkgs.easytier ];

flake.lock

@@ -987,16 +987,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1764623294,
+        "lastModified": 1765298291,
-        "narHash": "sha256-h94W20ZYS2HF1tSV7ZfZQf4Tsj9/0wofkBiRlepG/io=",
+        "narHash": "sha256-2vmjE1RD0ky+LkFQ1tUChfDQF9984o4ntFXIks0P7m8=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "30f11dc05202b85b390547ed194ef64f149b97f0",
+        "rev": "83bdb5b0fcb5b1a4306a6fad3e7c7bba245010c4",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
-        "ref": "v3.5.0",
+        "ref": "v3.6.2",
         "repo": "noctalia-shell",
         "type": "github"
       }

flake.nix

@@ -61,7 +61,7 @@
     zen.inputs.nixpkgs.follows = "nixpkgs";
 
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/v3.5.0";
+      url = "github:noctalia-dev/noctalia-shell/v3.6.2";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

lib/default.nix

@@ -13,7 +13,7 @@
       cfg = lib.getAttrFromPath optionPath config.my;
     in
     {
-      options.my = lib.setAttrByPath (optionPath) {
+      options.my = lib.setAttrByPath optionPath {
         enable = (lib.mkEnableOption optionName) // {
           inherit default;
         };