defaults/nextcloud/default.nix

@@ -13,7 +13,7 @@
     owner = name;
   };
 
-  qois.postgresql.enable = true;
+  services.postgresql.enable = true;
   qois.backup-client.includePaths = [ config.services.nextcloud.home ];
 
   services.nextcloud = {

nixos-configurations/lindberg-build/applications/attic.nix

@@ -52,11 +52,10 @@ in
 
   imports = [ ../../../defaults/webserver ];
 
-  qois.postgresql.enable = true;
-
   # Note: Attic cache availability is "best effort", so no artifacts are backed up.
 
   services.postgresql = {
+    enable = true;
     ensureDatabases = [ "atticd" ];
     ensureUsers = [
       {

nixos-configurations/lindberg-build/applications/default.nix

@@ -7,4 +7,5 @@
   ];
 
   qois.git-ci-runner.enable = true;
+  qois.postgresql.package = pkgs.postgresql_15;
 }

nixos-configurations/lindberg-nextcloud/applications/cloud.nix

@@ -6,7 +6,7 @@ in
 
   imports = [ ../../../defaults/nextcloud ];
 
-  qois.postgresql.enable = true;
+  services.postgresql.enable = true;
 
   services.nextcloud = {
     hostName = host;

nixos-configurations/lindberg-nextcloud/applications/default.nix

@@ -2,4 +2,6 @@
 {
 
   imports = [ ./cloud.nix ];
+
+  qois.postgresql.package = pkgs.postgresql_14;
 }

nixos-configurations/lindberg-webapps/applications/default.nix

@@ -6,4 +6,5 @@
   qois.vault.enable = true;
   qois.git.enable = true;
   qois.static-page.enable = true;
+  qois.postgresql.package = pkgs.postgresql_15;
 }

nixos-modules/postgresql/default.nix

@@ -11,11 +11,15 @@ in
 with lib;
 {
   options.qois.postgresql = {
-    enable = mkEnableOption ''Enable postgresql services with defaults'';
+    # Note: this module is auto-enabled if postgres is used.
+    package = mkPackageOption pkgs "postgresql" {
+      example = "postgresql_15";
+      default = null;
+    };
   };
 
-  config = mkIf cfg.enable {
-    services.postgresql.enable = true;
+  config = mkIf config.services.postgresql.enable {
+    services.postgresql.package = cfg.package;
     services.postgresqlBackup.enable = true;
     qois.backup-client.includePaths = [ config.services.postgresqlBackup.location ];
   };

nixos-modules/qois/git/default.nix

@@ -21,7 +21,7 @@ with lib;
   };
 
   config = mkIf cfg.enable {
-    qois.postgresql.enable = true;
+    services.postgresql.enable = true;
 
     services.forgejo = {
       enable = true;

nixos-modules/vault/default.nix

@@ -48,8 +48,6 @@ with lib;
       };
     };
 
-    qois.postgresql.enable = true;
-
     qois.backup-client.includePaths = [ config.services.vaultwarden.config.DATA_FOLDER ];
 
     services.postgresql =
@@ -57,6 +55,7 @@ with lib;
         name = config.users.users.vaultwarden.name;
       in
       {
+        enable = true;
         ensureUsers = [
           {
             inherit name;