updates for swan

hosts/x86_64-linux/swan/default.nix

@@ -33,6 +33,9 @@ rec {
 
   system.stateVersion = "23.05";
 
+  # Temp: disable while this isn't working
+  services.automatic-timezoned.enable = false;
+
   # Not sure what's necessary but too afraid to remove anything
   boot.initrd.availableKernelModules = [
     "xhci_pci"

pkgs/caddy/package.nix

@@ -18,5 +18,5 @@
 }).withPlugins
   {
     plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-    hash = "sha256-Zls+5kWd/JSQsmZC4SRQ/WS+pUcRolNaaI7UQoPzJA0=";
+    hash = "sha256-xz43pXTsnYmXZDAAUT+vTapoq3O/8br7igGwqZbjFdk=";
   }

platforms/nixos/modules/nmasur/presets/services/grafana/grafana.nix

@@ -35,7 +35,7 @@ in
       group = "grafana";
       permissions = "0440";
     };
-    systemd.services.grafana-secret-key  = {
+    systemd.services.grafana-secret-key-secret  = {
       requiredBy = [ "grafana.service" ];
       before = [ "grafana.service" ];
     };
@@ -791,7 +791,7 @@ in
                             properties = [
                               {
                                 id = "displayName";
-                                value = "Jellyseerr";
+                                value = "Seerr";
                               }
                               {
                                 id = "links";

platforms/nixos/modules/nmasur/presets/services/mealie.nix

@@ -15,6 +15,9 @@ in
       port = 9099;
       database.createLocally = true;
       listenAddress = "127.0.0.1";
+      settings = {
+        TOKEN_TIME = 7200; # Hours for login to last (300 days)
+      };
     };
 
     nmasur.presets.services.caddy.routes = [
@@ -23,7 +26,7 @@ in
         handle = [
           {
             handler = "reverse_proxy";
-            upstreams = [ { dial = "localhost:${builtins.toString config.services.mealie.port}"; } ];
+            upstreams = [ { dial = "localhost:${toString config.services.mealie.port}"; } ];
           }
         ];
       }

platforms/nixos/modules/nmasur/presets/services/nextcloud/nextcloud.nix

@@ -17,7 +17,7 @@ in
 
     services.nextcloud = {
       enable = true;
-      package = pkgs.nextcloud32; # Required to specify
+      package = pkgs.nextcloud33; # Required to specify
       configureRedis = true;
       datadir = "/data/nextcloud";
       database.createLocally = true;

platforms/nixos/modules/nmasur/presets/services/stalwart.nix

@@ -5,12 +5,12 @@
 
 let
   inherit (config.nmasur.settings) hostnames;
-  cfg = config.nmasur.presets.services.stalwart-mail;
+  cfg = config.nmasur.presets.services.stalwart;
 in
 
 {
 
-  options.nmasur.presets.services.stalwart-mail = {
+  options.nmasur.presets.services.stalwart = {
     enable = lib.mkEnableOption "Stalwart mail and contacts server";
     port = lib.mkOption {
       type = lib.types.port;
@@ -21,7 +21,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    services.stalwart-mail = {
+    services.stalwart = {
       enable = true;
       settings = {
         server.listener.http = {

platforms/nixos/modules/nmasur/presets/zfs.nix

@@ -45,6 +45,7 @@ in
       ];
       # If password is requested and fails, continue to boot eventually
       passwordTimeout = 300;
+      forceImportRoot = false; # Recommended default
     };
 
   };

platforms/nixos/modules/nmasur/profiles/communications.nix

@@ -38,7 +38,7 @@ in
         ntfy-sh.enable = lib.mkDefault true;
         pgweb.enable = lib.mkDefault true;
         postgresql.enable = lib.mkDefault true;
-        stalwart-mail.enable = lib.mkDefault true;
+        stalwart.enable = lib.mkDefault true;
         thelounge.enable = lib.mkDefault true;
         uptime-kuma.enable = lib.mkDefault true;
         vaultwarden.enable = lib.mkDefault true;