artemsion: samba, flakpak, palatine-hill: act-runner, samba, nextcloud

- adds happy 17th AO3 skin
- removes zen kernel from artemision
- adds flatpak to artemision
- adds samba client to artemision
- add samba import for palatine-hill
- fix formatting on act-runner
- fix nextcloud pre-generation script to use new image scheme

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

systems/palatine-hill/configuration.nix

@@ -17,6 +17,7 @@
     ./minio.nix
     ./networking.nix
     ./nextcloud.nix
+    ./samba.nix
     ./postgresql.nix
     ./zfs.nix
   ];

systems/palatine-hill/docker/act-runner.nix

@@ -8,30 +8,27 @@ let
   act_path = vars.primary_act;
 in
 {
-  virtualisation.oci-containers.containers.act-stable-latest-1 =
-
-    {
-      image = "gitea/act_runner:latest";
-      extraOptions = [
-        "--stop-signal=SIGINT"
-      ];
-      labels = {
-        "com.centurylinklabs.watchtower.enable" = "true";
-        "com.centurylinklabs.watchtower.scope" = "act-runner";
-      };
-      volumes = [
-        "${act_path}/stable-latest-1/config.yaml:/config.yaml"
-        "${act_path}/stable-latest-1/data:/data"
-        "/var/run/docker.sock:/var/run/docker.sock"
-      ];
-      environment = {
-        CONFIG_FILE = "/config.yaml";
-        GITEA_RUNNER_NAME = "stable-latest-1";
-      };
-      environmentFiles = [ config.sops.secrets."docker/act-runner".path ];
-      log-driver = "local";
-
+  virtualisation.oci-containers.containers.act-stable-latest-1 = {
+    image = "gitea/act_runner:latest";
+    extraOptions = [
+      "--stop-signal=SIGINT"
+    ];
+    labels = {
+      "com.centurylinklabs.watchtower.enable" = "true";
+      "com.centurylinklabs.watchtower.scope" = "act-runner";
     };
+    volumes = [
+      "${act_path}/stable-latest-1/config.yaml:/config.yaml"
+      "${act_path}/stable-latest-1/data:/data"
+      "/var/run/docker.sock:/var/run/docker.sock"
+    ];
+    environment = {
+      CONFIG_FILE = "/config.yaml";
+      GITEA_RUNNER_NAME = "stable-latest-1";
+    };
+    environmentFiles = [ config.sops.secrets."docker/act-runner".path ];
+    log-driver = "local";
+  };
 
   systemd = {
     timers."custom-watchtower@act-runner" = {

systems/palatine-hill/nextcloud.nix

@@ -17,12 +17,10 @@
 
   systemd.services."nextcloud-pre-generate" = {
     requires = [
-      "docker.service"
-      "multi-user.target"
+      "docker-nextcloud.service"
     ];
     after = [
-      "docker.service"
-      "multi-user.target"
+      "docker-nextcloud.service"
     ];
     description = "incremental pre-generation of previews on nextcloud";
     serviceConfig = {
@@ -31,10 +29,10 @@
       Group = "docker";
       ExecStart = [
         ''
-          ${pkgs.bash}/bin/bash -c '${pkgs.docker}/bin/docker ps --format "{{.Names}}" | ${pkgs.gnugrep}/bin/grep -q "^nextcloud-nextcloud-1$"'
+          ${pkgs.bash}/bin/bash -c '${pkgs.docker}/bin/docker ps --format "{{.Names}}" | ${pkgs.gnugrep}/bin/grep -q "^nextcloud$"'
         ''
         ''
-          ${pkgs.docker}/bin/docker exec --user www-data nextcloud-nextcloud-1 php occ preview:pre-generate
+          ${pkgs.docker}/bin/docker exec --user www-data nextcloud php occ preview:pre-generate
         ''
       ];
     };