diff --git a/hydra/jobs.nix b/hydra/jobs.nix index 6fbc994..d6f1306 100644 --- a/hydra/jobs.nix +++ b/hydra/jobs.nix @@ -8,10 +8,7 @@ let pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; getCfg = _: cfg: cfg.config.system.build.toplevel; - hostToAgg = _: cfg: cfg; - getHome = _: cfg: cfg.config.home.activationPackage; - homeToAgg = _: cfg: cfg; # get per-system check derivation (with optional postfix) mapSystems = @@ -27,15 +24,6 @@ rec { host = lib.mapAttrs getCfg outputs.nixosConfigurations; home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage - hosts = pkgs.releaseTools.aggregate { - name = "hosts"; - constituents = lib.mapAttrsToList hostToAgg host; - }; - homes = pkgs.releaseTools.aggregate { - name = "homes"; - constituents = lib.mapAttrsToList homeToAgg home; - }; - devChecks = pkgs.releaseTools.aggregate { name = "devChecks"; constituents = lib.flatten [ diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index 53143d8..a63a53f 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -86,21 +86,20 @@ in hostname = "pii"; environment = defaultEnv // { VERSION = "1.20.1"; - TYPE = "modrinth"; - MODRINTH_MODPACK = "prominence-2-fabric"; - MODRINTH_VERSION = "3.9.14hf"; + CF_SLUG = "prominence-2-hasturian-era"; + CF_FILENAME_MATCHER = "3.9.14hf"; USE_AIKAR_FLAGS = "false"; USE_MEOWICE_FLAGS = "true"; USE_MEOWICE_GRAALVM_FLAGS = "true"; DIFFICULTY = "hard"; ENABLE_COMMAND_BLOCK = "true"; - MODRINTH_FORCE_SYNCHRONIZE = "true"; - MODRINTH_FORCE_INCLUDE_FILES = '' + CF_FORCE_INCLUDE_FILES = '' emi ''; }; extraOptions = defaultOptions; log-driver = "local"; + environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; }; #stop_signal: SIGTERM #stop_grace_period: 5m