From 5876717df1cc809beb39e160df1b896d77ecc3a6 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felixalbrigtsen@gmail.com>
Date: Fri, 31 May 2024 22:19:23 +0200
Subject: [PATCH] all/voyager: update to nixos 24.05

---
 flake.lock                           | 16 ++++++++--------
 flake.nix                            |  4 ++--
 hosts/voyager/modules/snappymail.nix | 24 +++++++++---------------
 hosts/voyager/services/nextcloud.nix |  7 +++++--
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index f65a3e3..3c7baec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,16 +41,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -163,16 +163,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1716991068,
-        "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a48e790..de7ba83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
   description = "Felixalb System flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     matrix-synapse-next.url = "github:dali99/nixos-matrix-modules";
diff --git a/hosts/voyager/modules/snappymail.nix b/hosts/voyager/modules/snappymail.nix
index a6855e3..4fdb872 100644
--- a/hosts/voyager/modules/snappymail.nix
+++ b/hosts/voyager/modules/snappymail.nix
@@ -7,14 +7,9 @@ let
   maxUploadSize = "256M";
 in {
   options.services.snappymail = {
-    enable = mkEnableOption (lib.mdDoc "Snappymail");
+    enable = mkEnableOption "Snappymail";
 
-    package = mkOption {
-      type = types.package;
-      default = pkgs.snappymail;
-      defaultText = lib.mdDoc "pkgs.snappymail";
-      description = lib.mdDoc "Which snappymail package to use.";
-    };
+    package = mkPackageOption pkgs "snappymail" { };
 
     dataDir = mkOption {
       type = types.str;
@@ -23,8 +18,8 @@ in {
     };
 
     hostname = mkOption {
-      type = types.str;
-      /* default = null; */
+      type = types.nullOr types.str;
+      default = null;
       example = "mail.example.com";
       description = "Enable nginx with this hostname, null disables nginx";
     };
@@ -32,13 +27,13 @@ in {
     user = mkOption {
       type = types.str;
       default = "snappymail";
-      description = lib.mdDoc "System user under which snappymail runs";
+      description = "System user under which snappymail runs";
     };
 
     group = mkOption {
       type = types.str;
       default = "snappymail";
-      description = lib.mdDoc "System group under which snappymail runs";
+      description = "System group under which snappymail runs";
     };
   };
 
@@ -48,8 +43,6 @@ in {
         description = "Snappymail service";
         group = cfg.group;
         home = cfg.dataDir;
-        useDefaultShell = true;
-        createHome = true;
         isSystemUser = true;
       };
     };
@@ -88,8 +81,9 @@ in {
         locations."^~ /data".extraConfig = ''
           deny all;
         '';
-        locations."~ \.php$".extraConfig = ''
-          include ${pkgs.nginx}/conf/fastcgi_params;
+        locations."~ \\.php$".extraConfig = ''
+          include ${config.services.nginx.package}/conf/fastcgi_params;
+
           fastcgi_param   SCRIPT_FILENAME $document_root$fastcgi_script_name;
           fastcgi_pass unix:${config.services.phpfpm.pools.snappymail.socket};
         '';
diff --git a/hosts/voyager/services/nextcloud.nix b/hosts/voyager/services/nextcloud.nix
index 93b2964..78c8db7 100644
--- a/hosts/voyager/services/nextcloud.nix
+++ b/hosts/voyager/services/nextcloud.nix
@@ -18,8 +18,11 @@ in {
       dbname = "nextcloud";
       adminuser = "ncadmin";
       adminpassFile = config.sops.secrets."nextcloud/adminpass".path;
-      trustedProxies = [ "192.168.10.175" ]; # defiant
-      defaultPhoneRegion = "NO";
+    };
+
+    settings = {
+      trusted_proxies = [ "192.168.10.175" ]; # defiant
+      default_phone_region = "NO";
     };
 
     phpOptions = {