Switch to overlays for draupnir/synapse

1 files changed, 27 insertions, 4 deletions

diff --git a/flake.nix b/flake.nix
index f72ff9c..0dfa8b4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -8,9 +8,8 @@
       #url="path:/Rory-Open-Architecture/nixpkgs";
     };
 
-    nixpkgs-rory = {
-      #url = "path:/Rory-Open-Architecture/nixpkgs";
-      url = "github:TheArcaneBrony/nixpkgs/master";
+    nixpkgs-master = {
+      url = "github:NixOs/nixpkgs/master";
     };
 
     nixpkgs-RoryNix = {
@@ -18,6 +17,11 @@
       url = "github:NixOS/nixpkgs/nixos-23.11";
     };
 
+    nixpkgs-Draupnir = { # Draupnir module/package
+      url = "github:TheArcaneBrony/nixpkgs/master";
+      #url = "path:/Rory-Open-Architecture/nixpkgs";
+    };
+
     # Base modules
     home-manager.url = "github:nix-community/home-manager/master";
     sops-nix.url = "github:Mic92/sops-nix";
@@ -49,13 +53,32 @@
     inputs: with inputs; {
       nixosConfigurations = {
         #NIXPKGS FORK
-        Rory-nginx = nixpkgs-rory.lib.nixosSystem {
+        Rory-nginx = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             ./host/Rory-nginx/configuration.nix
             ./hardware-configuration.nix
             home-manager.nixosModules.home-manager
             grapevine.nixosModules.default
+
+            (
+              { pkgs, ... }: 
+              {
+                disabledModules = [
+                  "services/matrix/synapse.nix"
+                ];
+                imports = [
+                  "${nixpkgs-master}/nixos/modules/services/matrix/synapse.nix"
+                  "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
+                ];
+                nixpkgs.overlays = [
+                  (final: prev: {
+                    matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped;
+                    draupnir = inputs.nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+                  })
+                ];
+              }
+            )
           ];
           specialArgs = {
             inherit botcore-v4;