Switch to overlays for draupnir/synapse

4 files changed, 86 insertions, 47 deletions

diff --git a/flake.lock b/flake.lock
index 80d6954..9618674 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,11 +78,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1720386818,
-        "narHash": "sha256-5aObNROA/OnezQVD2LmST8ysoJyp5VeTZJP7C4TvtiU=",
+        "lastModified": 1721379485,
+        "narHash": "sha256-Pcfv3IB4yGiSC4N5BqD6T9u+YYBiwjJ+VGzg0WGCjK8=",
         "owner": "famedly",
         "repo": "conduit",
-        "rev": "00c9ef7b565305c3e08cdba595832c299fe87342",
+        "rev": "44dd21f432a22c82adab77c25469c336976f4081",
         "type": "gitlab"
       },
       "original": {
@@ -403,11 +403,11 @@
       },
       "locked": {
         "host": "gitlab.computer.surgery",
-        "lastModified": 1719530301,
-        "narHash": "sha256-jteW09FEGmI0scXvs8naqbORoEo8TlzY1QjOZt3rdKY=",
+        "lastModified": 1721153768,
+        "narHash": "sha256-lwRXfp7oRil1ntyErWzLxXoOXMZ75+HkpaTKlSrVRDI=",
         "owner": "matrix",
         "repo": "grapevine-fork",
-        "rev": "b05c91b13e215816da1d7b45862952c2c73b8d55",
+        "rev": "bf799c1fa1fb9592b8792c747594662c903068db",
         "type": "gitlab"
       },
       "original": {
@@ -422,11 +422,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1720327769,
-        "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
+        "lastModified": 1721135958,
+        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
+        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
         "type": "github"
       },
       "original": {
@@ -508,11 +508,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1720428387,
-        "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
+        "lastModified": 1721226275,
+        "narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
+        "rev": "8ebede998342477736e0d0acdcc13ddb166a335f",
         "type": "github"
       },
       "original": {
@@ -537,13 +537,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-Draupnir": {
+      "locked": {
+        "lastModified": 1719309243,
+        "narHash": "sha256-jkt9UH5zW7BpD1vr1xFum39iNAzkBGtGgTlEqHgxfF8=",
+        "owner": "TheArcaneBrony",
+        "repo": "nixpkgs",
+        "rev": "3b1beb5027c6781325b372fa25b0c93c524a8084",
+        "type": "github"
+      },
+      "original": {
+        "owner": "TheArcaneBrony",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-RoryNix": {
       "locked": {
-        "lastModified": 1719957072,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
+        "lastModified": 1720535198,
+        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
+        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
         "type": "github"
       },
       "original": {
@@ -553,17 +569,17 @@
         "type": "github"
       }
     },
-    "nixpkgs-rory": {
+    "nixpkgs-master": {
       "locked": {
-        "lastModified": 1719309243,
-        "narHash": "sha256-jkt9UH5zW7BpD1vr1xFum39iNAzkBGtGgTlEqHgxfF8=",
-        "owner": "TheArcaneBrony",
+        "lastModified": 1721472496,
+        "narHash": "sha256-uSLQukUsGucbmnLySiMZZckSCCLb76r5nj3dYBlHDwA=",
+        "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "3b1beb5027c6781325b372fa25b0c93c524a8084",
+        "rev": "ed7137cd35fa2621595f2b1f7d35f65e609e4faa",
         "type": "github"
       },
       "original": {
-        "owner": "TheArcaneBrony",
+        "owner": "NixOs",
         "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
@@ -603,11 +619,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1720282526,
-        "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=",
+        "lastModified": 1720915306,
+        "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927",
+        "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
         "type": "github"
       },
       "original": {
@@ -683,11 +699,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1720244366,
-        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "lastModified": 1720823163,
+        "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
         "type": "github"
       },
       "original": {
@@ -699,11 +715,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1720031269,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "lastModified": 1721379653,
+        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
         "type": "github"
       },
       "original": {
@@ -715,11 +731,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1720181791,
-        "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=",
+        "lastModified": 1720781449,
+        "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb",
+        "rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
         "type": "github"
       },
       "original": {
@@ -739,8 +755,9 @@
         "nhekoSrc": "nhekoSrc",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_7",
+        "nixpkgs-Draupnir": "nixpkgs-Draupnir",
         "nixpkgs-RoryNix": "nixpkgs-RoryNix",
-        "nixpkgs-rory": "nixpkgs-rory",
+        "nixpkgs-master": "nixpkgs-master",
         "sops-nix": "sops-nix"
       }
     },
@@ -784,11 +801,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1720321395,
-        "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=",
+        "lastModified": 1720926522,
+        "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea",
+        "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
         "type": "github"
       },
       "original": {
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;
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index b85a75e..05949d0 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -74,10 +74,5 @@
     conduit = conduit;
   };
 
-  #containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
-  #  inherit pkgs lib;
-  #  conduit = conduwuit;
-  #};
-
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
diff --git a/modules/base-server.nix b/modules/base-server.nix
index 93ca9f8..cf10ca3 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -101,9 +101,13 @@
     defaultGateway = "192.168.1.1";
   };
 
-  sound.enable = false;
   hardware.pulseaudio.enable = false;
 
+  # This shaves off half a gigabyte of disk space...
+  hardware.enableAllFirmware = false;
+  hardware.enableRedistributableFirmware = false;
+
+
   i18n.defaultLocale = "en_US.UTF-8";
   services = {
     prometheus = {