tree-wide: fix errors and warning related to loaOf deprecation

4 files changed, 14 insertions, 10 deletions

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 0be60d8ff767a..b5ed2c594f77e 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -334,7 +334,7 @@ in
     } // optionalAttrs (cfg.group == "dovecot2") {
       dovecot2.gid = config.ids.gids.dovecot2;
     } // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
-      ${cfg.mailgroup} = { };
+      ${cfg.mailGroup} = { };
     };
 
     environment.etc."dovecot/modules".source = modulesDir;
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index f9a0c06c287cd..eb6a426684d42 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -99,7 +99,7 @@ in {
     };
 
     users.groups = optionalAttrs (cfg.group == "opendkim") {
-      opendkimgid = config.ids.gids.opendkim;
+      opendkim.gid = config.ids.gids.opendkim;
     };
 
     environment.systemPackages = [ pkgs.opendkim ];
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 654d0cfed700c..d7378821440d3 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -665,9 +665,9 @@ in
 
       users.groups =
         optionalAttrs (group == "postfix")
-        { group.gid = config.ids.gids.postfix;
+        { ${group}.gid = config.ids.gids.postfix;
         }
-        ++ optionalAttrs (setgidGroup == "postdrop")
+        // optionalAttrs (setgidGroup == "postdrop")
         { ${setgidGroup}.gid = config.ids.gids.postdrop;
         };
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index b495b3948fb57..52ecd90b7c699 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -92,17 +92,21 @@ in
         message = "Quassel needs a certificate file in order to require SSL";
       }];
 
-    users.users = mkIf (cfg.user == null) [
-      { name = "quassel";
+    users.users = optionalAttrs (cfg.user == null) {
+      quassel = {
+        name = "quassel";
         description = "Quassel IRC client daemon";
         group = "quassel";
         uid = config.ids.uids.quassel;
-      }];
+      };
+    };
 
-    users.groups = mkIf (cfg.user == null) [
-      { name = "quassel";
+    users.groups = optionalAttrs (cfg.user == null) {
+      quassel = {
+        name = "quassel";
         gid = config.ids.gids.quassel;
-      }];
+      };
+    };
 
     systemd.tmpfiles.rules = [
       "d '${cfg.dataDir}' - ${user} - - -"