Merge pull request 'switch to CF' (#176) from feature/pii into main

Reviewed-on: #176

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 [

systems/palatine-hill/docker/minecraft.nix

@@ -23,7 +23,7 @@ let
     STOP_DURATION = "600";
     SYNC_CHUNK_WRITES = "false";
     USE_AIKAR_FLAGS = "true";
-    MEMORY = "12GB";
+    MEMORY = "12G";
     ALLOW_FLIGHT = "true";
     MAX_TICK_TIME = "-1";
     ENABLE_RCON = "true";
@@ -86,17 +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";
+        CF_FORCE_INCLUDE_FILES = ''
+          emi
+        '';
       };
       extraOptions = defaultOptions;
       log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
     #stop_signal: SIGTERM
     #stop_grace_period: 5m