diff --git a/flake.lock b/flake.lock index fbb6f78..d1c6694 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1717292983, - "narHash": "sha256-0K2xYJ4kZoezEI35hAJfe9uyDCEdsHe4AR7jIpoRDnE=", + "lastModified": 1717638331, + "narHash": "sha256-ikwAuKry4EGsKjp7+7Du5bKFvx7mrNch67iczo//YQg=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "663e2347fc5e57cbd0f5c620ff6a6ad6a6ed4edb", + "rev": "46a33f9b2ad1cb836721b2eea0629ed23b86cb61", "type": "github" }, "original": { @@ -43,15 +43,15 @@ ] }, "locked": { - "lastModified": 1717340201, - "narHash": "sha256-zVhfUqoUJ4zKmXCg4nAzP4QNmwRRf7TkTQpkn4MzJxs=", - "rev": "0993fe45f63e5d66dbbe9f72c7fd68c6ab6e7ea8", + "lastModified": 1717676930, + "narHash": "sha256-wFUX68Z4NSyNys2od//ASl8HWIRKDL+zDWdiVGMPC10=", + "rev": "0dc3b9f05697bfcce32d3e5a756fdcb50989be83", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/0993fe45f63e5d66dbbe9f72c7fd68c6ab6e7ea8.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/0dc3b9f05697bfcce32d3e5a756fdcb50989be83.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.clan.lol/clan/clan-core/archive/main.tar.gz" + "url": "https://git.clan.lol/clan/clan-core/archive/synapse.tar.gz" } }, "disko": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1716773194, - "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=", + "lastModified": 1717177033, + "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", "owner": "nix-community", "repo": "disko", - "rev": "10986091e47fb1180620b78438512b294b7e8f67", + "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixos-2311": { "locked": { - "lastModified": 1716767563, - "narHash": "sha256-xaSLDTqKIU55HsCkDnzFKmPiJO2z1xAAvrhUlwlmT2M=", + "lastModified": 1717017538, + "narHash": "sha256-S5kltvDDfNQM3xx9XcvzKEOyN2qk8Sa+aSOLqZ+1Ujc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c007b36981bdbd69ccf0c7df30a174e63660667", + "rev": "64e468fd2652105710d86cd2ae3e65a5a6d58dec", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1716786664, - "narHash": "sha256-iszhOLhxnv+TX/XM2gAX4LhTCoMzLuG51ObZq/eyDx8=", + "lastModified": 1717040312, + "narHash": "sha256-yI/en4IxuCEClIUpIs3QTyYCCtmSPLOhwLJclfNwdeg=", "owner": "nix-community", "repo": "nixos-images", - "rev": "2478833ef8cc6de3d9e331f53b6f3682e425f207", + "rev": "47bfb55316e105390dd761e0b6e8e0be09462b67", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "lastModified": 1717459389, + "narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1717058062, - "narHash": "sha256-R8Gb2MlJzfBE76DVWFmfZWODMdAanqxFnK+OOmkoQ7E=", + "lastModified": 1717635218, + "narHash": "sha256-1fd4myxpeHrdBuXyjQqEp1lqq1CJeuPXPk67TlD6UKA=", "owner": "numtide", "repo": "srvos", - "rev": "414d1039a58b667e4512ad9f7068aa935ebf8d59", + "rev": "5e0d94f2b3608f2d01208e27d4a4db5a0e85b069", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e576194..53aef2c 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ # Use the version of nixpkgs that has been tested to work with SrvOS srvos.inputs.nixpkgs.follows = "nixpkgs"; - clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; + clan-core.url = "https://git.clan.lol/clan/clan-core/archive/synapse.tar.gz"; clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.treefmt-nix.follows = "treefmt-nix"; diff --git a/modules/web01/default.nix b/modules/web01/default.nix index b4b7fba..d1d7b3a 100644 --- a/modules/web01/default.nix +++ b/modules/web01/default.nix @@ -8,7 +8,7 @@ ./homepage.nix ./postfix.nix ./jobs.nix - #./matrix-synapse.nix + ./matrix-synapse.nix ../dev.nix self.inputs.clan-core.clanModules.zt-tcp-relay ]; diff --git a/modules/web01/matrix-synapse.nix b/modules/web01/matrix-synapse.nix index a32db76..9730588 100644 --- a/modules/web01/matrix-synapse.nix +++ b/modules/web01/matrix-synapse.nix @@ -1,6 +1,5 @@ { self, ... }: { imports = [ self.inputs.clan-core.clanModules.matrix-synapse ]; - clan.matrix-synapse.enable = true; clan.matrix-synapse.domain = "clan.lol"; } diff --git a/targets/flake-module.nix b/targets/flake-module.nix index b4718c5..c4a3c3c 100644 --- a/targets/flake-module.nix +++ b/targets/flake-module.nix @@ -1,7 +1,7 @@ { self, inputs, ... }: { flake = inputs.clan-core.lib.buildClan { - clanName = "infra"; + meta.name = "infra"; directory = self; # Make flake available in modules specialArgs = {