diff --git a/flake.nix b/flake.nix index d4ab459..dbce573 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,6 @@ homepage = { url = "github:baduhai/homepage"; flake = false; }; dotfiles = { url = "github:baduhai/dotfiles"; flake = false; }; - - conduit = { url = "gitlab:famedly/conduit"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; }; outputs = inputs @ { @@ -38,7 +36,6 @@ nixos-generators, homepage, dotfiles, - conduit, ... }: { nixosConfigurations = { @@ -74,6 +71,15 @@ agenix.nixosModules.default home-manager-stable.nixosModules.home-manager self.nixosModules.qbittorrent + ({ config, pkgs, ... }: + let + unstable-overlay = final: prev: { + unstable = nixpkgs.legacyPackages.x86_64-linux; + }; + in { + nixpkgs.overlays = [ overlay-unstable ]; + } + ) ]; }; }; diff --git a/hosts/servers/alexandria/conduit.nix b/hosts/servers/alexandria/conduit.nix index 3c9100f..a2f5fc5 100644 --- a/hosts/servers/alexandria/conduit.nix +++ b/hosts/servers/alexandria/conduit.nix @@ -45,9 +45,10 @@ in services.matrix-conduit = { enable = true; - # This causes NixOS to use the flake defined in this repository instead of - # the build of Conduit built into nixpkgs. - package = inputs.conduit.packages.${pkgs.system}.default; + package = pkgs.unstable.conduit; + + global.allow_federation = false; + global.allow_registration = true; settings.global = { inherit server_name;