Fix flake

3 files changed, 9 insertions, 8 deletions

diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix

index 85b3b1f..428c6e6 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -7,10 +7,6 @@
       ../../modules/users/levi.nix
       ../../modules/users/db2k.nix
 
-      ../../modules/services/nginx.nix
-      ../../modules/services/postgres.nix
-      ../../modules/services/matrix/root.nix.nix
-
       ./software.nix
     ];
   users.groups.ocp = {};
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix

index 77ba1fb..e3ccc66 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, conduit-flake, ... }:
 
 {
   imports =
@@ -7,13 +7,15 @@
     ];
 
   services.matrix-conduit = {
+    package = conduit-flake;
     enable = true;
     settings.global = {
       server_name = "conduit.rory.gay";
+      database_backend = "rocksdb";
+      enable_lightning_bolt = true;
+      max_concurrent_requests = 1000;
+      allow_check_for_updates = false;
     };
-    database_backend = "rocksdb";
-    enable_lightning_bolt = true;
-    max_concurrent_requests = 1000;
   };
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
diff --git a/host/Rory-nginx/software.nix b/host/Rory-nginx/software.nix

index 56b09f4..68a629e 100755
--- a/host/Rory-nginx/software.nix
+++ b/host/Rory-nginx/software.nix
@@ -4,6 +4,9 @@
   imports =
     [
       ../../modules/base-server.nix
+      ./services/nginx.nix
+      ./services/postgres.nix
+      ./services/matrix/root.nix.nix
       #../../modules/packages/gitfs.nix
     ];