server: extraOptions to options

11 files changed, 31 insertions, 16 deletions

diff --git a/modules/server/virtualisation/containers/beszel-agent.nix b/modules/server/virtualisation/containers/beszel-agent.nix
index 9a3f96f..aa0e493 100644
--- a/modules/server/virtualisation/containers/beszel-agent.nix
+++ b/modules/server/virtualisation/containers/beszel-agent.nix
@@ -1,15 +1,11 @@
-{ secrets, ... }:
+{ secrets, config, ... }:
 {
   virtualisation.oci-containers.containers.beszel-agent = {
     image = "henrygd/beszel-agent";
     autoStart = true;
     ports = [ "127.0.0.1:45876:45876" ];
     volumes = [ "/var/run/docker.sock:/var/run/docker.sock:ro" ];
-
-    extraOptions = [
-      "--network=host"
-      "--restart=on-failure"
-    ];
+    extraOptions = config.modules.containers.extraOptions ++ [ "--network=host" ];
 
     environment = {
       PORT = "45876";
diff --git a/modules/server/virtualisation/containers/beszel.nix b/modules/server/virtualisation/containers/beszel.nix
index 344869d..c86a109 100644
--- a/modules/server/virtualisation/containers/beszel.nix
+++ b/modules/server/virtualisation/containers/beszel.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.beszel = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "henrygd/beszel";
     autoStart = true;
     ports = [ "127.0.0.1:8083:8090" ];
     volumes = [ "/mnt/docker/beszel:/beszel_data" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/gigi.nix b/modules/server/virtualisation/containers/gigi.nix
index 3b15650..89803d3 100644
--- a/modules/server/virtualisation/containers/gigi.nix
+++ b/modules/server/virtualisation/containers/gigi.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.gigi = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/gigi";
     autoStart = true;
     ports = [ "79:79" ];
     volumes = [ "/mnt/docker/gigi:/gigi/.gigi" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/litterbox.nix b/modules/server/virtualisation/containers/litterbox.nix
index 4862fec..247226c 100644
--- a/modules/server/virtualisation/containers/litterbox.nix
+++ b/modules/server/virtualisation/containers/litterbox.nix
@@ -1,8 +1,10 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.litterbox = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/litterbox";
     autoStart = true;
     volumes = [ "/mnt/docker/litterbox:/root/.config/litterbox" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/locus.nix b/modules/server/virtualisation/containers/locus.nix
index bdec6ac..3872347 100644
--- a/modules/server/virtualisation/containers/locus.nix
+++ b/modules/server/virtualisation/containers/locus.nix
@@ -1,13 +1,14 @@
 { config, ... }:
 {
   virtualisation.oci-containers.containers.locus = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "ghcr.io/gemrest/locus";
     autoStart = true;
     ports = [ "1965:1965" ];
     volumes = [ "/mnt/docker/locus:/locus/.locus" ];
     environment.HEADER_IMAGE = "https://ruu.neocities.org/images/animeHeader.gif";
     environmentFiles = [ config.sops.secrets.finnhub_token.path ];
-    extraOptions = [ "--restart=on-failure" ];
 
     login = {
       registry = "ghcr.io";
diff --git a/modules/server/virtualisation/containers/mayu.nix b/modules/server/virtualisation/containers/mayu.nix
index b1ab9a5..06f818b 100644
--- a/modules/server/virtualisation/containers/mayu.nix
+++ b/modules/server/virtualisation/containers/mayu.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.mayu = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/mayu";
     autoStart = true;
     ports = [ "127.0.0.1:8098:3000" ];
     volumes = [ "/mnt/docker/mayu:/mayu/data" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/momoka.nix b/modules/server/virtualisation/containers/momoka.nix
index 2356313..f73242f 100644
--- a/modules/server/virtualisation/containers/momoka.nix
+++ b/modules/server/virtualisation/containers/momoka.nix
@@ -1,8 +1,10 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.momoka = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/momoka";
     autoStart = true;
     ports = [ "70:70" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/pounce.nix b/modules/server/virtualisation/containers/pounce.nix
index 9814872..682f8d9 100644
--- a/modules/server/virtualisation/containers/pounce.nix
+++ b/modules/server/virtualisation/containers/pounce.nix
@@ -1,10 +1,12 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.pounce = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/pounce";
     autoStart = true;
     ports = [ "6697:6697" ];
     volumes = [ "/mnt/docker/pounce:/root/.config/pounce" ];
     environment.USER = "fuwn";
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/september.nix b/modules/server/virtualisation/containers/september.nix
index dfaf41e..d48666c 100644
--- a/modules/server/virtualisation/containers/september.nix
+++ b/modules/server/virtualisation/containers/september.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.september = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "fuwn/september";
     autoStart = true;
     ports = [ "127.0.0.1:8084:80" ];
-    extraOptions = [ "--restart=on-failure" ];
 
     environment = {
       CONDENSE_LINKS_AT_HEADINGS = "## Quick Links,# Fuwn[.me],## Footer";
diff --git a/modules/server/virtualisation/containers/uptime-kuma.nix b/modules/server/virtualisation/containers/uptime-kuma.nix
index 4cd0bb1..a4406d7 100644
--- a/modules/server/virtualisation/containers/uptime-kuma.nix
+++ b/modules/server/virtualisation/containers/uptime-kuma.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.uptime-kuma = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "louislam/uptime-kuma";
     autoStart = true;
     ports = [ "127.0.0.1:8099:3001" ];
     volumes = [ "/mnt/docker/uptime-kuma:/app/data" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/wastebin.nix b/modules/server/virtualisation/containers/wastebin.nix
index 41c97ac..358a9ba 100644
--- a/modules/server/virtualisation/containers/wastebin.nix
+++ b/modules/server/virtualisation/containers/wastebin.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
 {
   virtualisation.oci-containers.containers.bin = {
+    inherit (config.modules.containers) extraOptions;
+
     image = "quxfoo/wastebin";
     autoStart = true;
     ports = [ "127.0.0.1:8090:8088" ];
     volumes = [ "/mnt/docker/bin:/root/db" ];
-    extraOptions = [ "--restart=on-failure" ];
   };
 }