From 403554015a7275dbfa29fb881d9fce90938696e8 Mon Sep 17 00:00:00 2001
From: Lucy Hochkamp <git@xyno.systems>
Date: Sun, 10 Dec 2023 13:16:29 +0100
Subject: [PATCH] fix

---
 hosts/ds9/default.nix               | 2 +-
 hosts/picard/default.nix            | 4 ++--
 hosts/picard/xynospace-matrix.nix   | 2 +-
 nixos-modules/services/authelia.nix | 6 +++---
 nixos-modules/services/hedgedoc.nix | 2 +-
 nixos-modules/system/agenix.nix     | 2 +-
 nixos-modules/user/default.nix      | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix
index 62110102..c2a4c929 100644
--- a/hosts/ds9/default.nix
+++ b/hosts/ds9/default.nix
@@ -74,7 +74,7 @@ in
     enable = true;
     configurations."ds9-offsite" = {
       source_directories = [ "/backups" "/data" "/persistent" ];
-      repositories = [ "ssh://root@gatebridge/media/backup/ds9" ];
+      repositories = [{ label = "gatebridge"; path = "ssh://root@gatebridge/media/backup/ds9"; }];
       exclude_if_present = [ ".nobackup" ];
       #upload_rate_limit = "4000";
       encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.borgmaticEncryptionKey.path}";
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 18a4bdca..4c7d954b 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -147,8 +147,8 @@
     configurations."picard-ds9" = {
       source_directories = [ "/persistent" ];
       repositories = [
-        "ssh://picardbackup@ds9/backups/picard/borgmatic"
-        "ssh://root@gatebridge/media/backup/picard"
+        { label = "ds9"; path = "ssh://picardbackup@ds9/backups/picard/borgmatic"; }
+        { label = "gatebridge"; path = "ssh://root@gatebridge/media/backup/picard"; }
       ];
       exclude_if_present = [ ".nobackup" ];
       encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.picardResticPassword.path}";
diff --git a/hosts/picard/xynospace-matrix.nix b/hosts/picard/xynospace-matrix.nix
index 8f1cc3be..5afd078d 100644
--- a/hosts/picard/xynospace-matrix.nix
+++ b/hosts/picard/xynospace-matrix.nix
@@ -47,7 +47,7 @@ in
     ensureUsers = [
       {
         name = "slidingsync";
-        ensurePermissions."DATABASE slidingsync" = "ALL PRIVILEGES";
+        ensureDBOwnership = true;
       }
     ];
   };
diff --git a/nixos-modules/services/authelia.nix b/nixos-modules/services/authelia.nix
index 4370fb78..30a26b05 100644
--- a/nixos-modules/services/authelia.nix
+++ b/nixos-modules/services/authelia.nix
@@ -50,7 +50,7 @@ in
             host = "/run/postgresql";
             port = "5432";
             database = "authelia";
-            username = "authelia-main";
+            username = "authelia";
             password = "dosentmatter";
           };
         };
@@ -68,8 +68,8 @@ in
       ensureDatabases = [ "authelia" ];
       ensureUsers = [
         {
-          name = "authelia-main";
-          ensurePermissions."DATABASE authelia" = "ALL PRIVILEGES";
+          name = "authelia";
+          ensureDBOwnership = true;
         }
       ];
     };
diff --git a/nixos-modules/services/hedgedoc.nix b/nixos-modules/services/hedgedoc.nix
index b20fc88c..e58d8ab3 100644
--- a/nixos-modules/services/hedgedoc.nix
+++ b/nixos-modules/services/hedgedoc.nix
@@ -59,7 +59,7 @@ in
       ensureUsers = [
         {
           name = "hedgedoc";
-          ensurePermissions."DATABASE hedgedoc" = "ALL PRIVILEGES";
+          ensureDBOwnership = true;
         }
       ];
     };
diff --git a/nixos-modules/system/agenix.nix b/nixos-modules/system/agenix.nix
index b3c8cce6..140d0010 100644
--- a/nixos-modules/system/agenix.nix
+++ b/nixos-modules/system/agenix.nix
@@ -19,7 +19,7 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ inputs.agenix.packages.${pkgs.system}.default ];
     # Set passwords
-    users.users.root.passwordFile = config.age.secrets.rootPasswd.path;
+    users.users.root.hashedPasswordFile = config.age.secrets.rootPasswd.path;
     age.identityPaths =
       [
         "/persistent/etc/ssh/ssh_host_ed25519_key"
diff --git a/nixos-modules/user/default.nix b/nixos-modules/user/default.nix
index 09c11eac..085caf3d 100644
--- a/nixos-modules/user/default.nix
+++ b/nixos-modules/user/default.nix
@@ -57,7 +57,7 @@ in
       extraGroups = [ "wheel" ] ++ extraGroups;
       shell = pkgs.zsh;
       openssh.authorizedKeys.keys = pubkeys.ragon.user ++ extraAuthorizedKeys;
-      passwordFile = config.age.secrets.ragonPasswd.path;
+      hashedPasswordFile = config.age.secrets.ragonPasswd.path;
     };
     ragon.agenix.secrets.ragonPasswd = { };