Merge branch 'fix/structured-settings' into 'main'

module: make use of structured settings

Closes #10

See merge request coffeetables/nix-matrix-appservices!9

3 files changed, 6 insertions, 6 deletions

diff --git a/flake.lock b/flake.lock
index fe074e7..84cd955 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,16 +48,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643503720,
-        "narHash": "sha256-tJic20ufuRnG8V+fTCd3YU6xl1ImxNspoEkXHct0AG4=",
+        "lastModified": 1662099760,
+        "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0f316e4d72daed659233817ffe52bf08e081b5de",
+        "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 38e555e..323df27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
     devshell.url = "github:numtide/devshell";
     nixlib.url = "github:divnix/nixpkgs.lib";
     flake-compat = {
diff --git a/modules/matrix-appservices/default.nix b/modules/matrix-appservices/default.nix
index f57284d..f8eb980 100644
--- a/modules/matrix-appservices/default.nix
+++ b/modules/matrix-appservices/default.nix
@@ -170,7 +170,7 @@ in
           (filterAttrs (_: v: v.registrationData != { }) cfg.services);
       in
       mkIf cfg.addRegistrationFiles {
-        matrix-synapse.app_service_config_files = mkIf (cfg.homeserver == "matrix-synapse") registrationFiles;
+        matrix-synapse.settings.app_service_config_files = mkIf (cfg.homeserver == "matrix-synapse") registrationFiles;
         dendrite.settings.app_service_api.config_files = mkIf (cfg.homeserver == "dendrite") registrationFiles;
       };
   };