feat(nix): use new packwiz2nixnew-packwiz2nix

6 files changed, 41 insertions, 47 deletions

diff --git a/.packwizignore b/.packwizignore
index 5547814..3b0ba92 100644
--- a/.packwizignore
+++ b/.packwizignore
@@ -4,4 +4,4 @@
 /.github
 /flake.nix
 /flake.lock
-/checksums.json
+/files/
diff --git a/checksums.json b/checksums.json
deleted file mode 100644
index 4a82e52..0000000
--- a/checksums.json
+++ /dev/null
@@ -1 +0,0 @@
-{"appleskin.pw.toml":{"sha256":"ee9f80fdcabf43d65cb15681b206d571143d2273641e86682714386abf035055","url":"https://cdn.modrinth.com/data/EsAfCjCV/versions/CxnVG86Y/appleskin-fabric-mc1.20-2.5.0.jar"},"architectury-api.pw.toml":{"sha256":"0c55eda09caa42c625ca1d91e32078f73a8b1d0eef62f20b748569c84cb13147","url":"https://cdn.modrinth.com/data/lhGA9TYQ/versions/Sbew3kXe/architectury-9.1.12-fabric.jar"},"better-beds.pw.toml":{"sha256":"ab5712649d9c9f3ada636bbcc52e71099edc5ec674a7d52f27f2b61ffdccf2f4","url":"https://cdn.modrinth.com/data/kKwy3HU9/versions/oA7DgMo2/betterbeds-1.3.0-1.19.3.jar"},"better-ping-display-fabric.pw.toml":{"sha256":"f9f14d7df5c6de56d7c8447b7729d724baa74f0e27b594a201af04381045ece5","url":"https://cdn.modrinth.com/data/MS1ZMyR7/versions/FbxcDBxy/BetterPingDisplay-Fabric-1.20.1-1.1.1.jar"},"c2me-fabric.pw.toml":{"sha256":"53f8418f91d9421f6f4a29370ac070d467a54bfda04832c93027393e97bb375b","url":"https://cdn.modrinth.com/data/VSNURh3q/versions/7y1gLd3J/c2me-fabric-mc1.20.1-0.2.0%2Balpha.10.107.jar"},"continuity.pw.toml":{"sha256":"a2ef368b92fd77e1388acd92f1bb58c2b535eba62ce4b1391c2f1803ad3666a3","url":"https://cdn.modrinth.com/data/1IjD5062/versions/xy2co4Rh/continuity-3.0.0-beta.3%2B1.20.1.jar"},"cull-leaves.pw.toml":{"sha256":"e13aba22784b151d6fd3da82b3df5e48f70fb289f35b98aa8de5250e489df32d","url":"https://cdn.modrinth.com/data/GNxdLCoP/versions/vGCKmen2/cullleaves-quilt-3.2.0.jar"},"debugify.pw.toml":{"sha256":"c61b78a7609c989578e98837047bc026d32654a0ad55f9118bb35f295536949d","url":"https://cdn.modrinth.com/data/QwxR6Gcd/versions/6XDJoCks/Debugify-1.20.1%2B2.0.jar"},"dynamic-fps.pw.toml":{"sha256":"c1036acfd620f91699c9e6e3923e899d42175cbf3e926fc609ee48e3baf5726e","url":"https://cdn.modrinth.com/data/LQ3K71Q1/versions/5LX1Blqr/dynamic-fps-3.1.0%2Bminecraft-1.20.0.jar"},"e4mc.pw.toml":{"sha256":"bf04e416037c15b5ba132c15a0da9462ce98d8a8c9478acce6a1f279d546cb1a","url":"https://cdn.modrinth.com/data/qANg5Jrr/versions/vVFlVRt7/e4mc-4.0.1%2B1.19.4-fabric.jar"},"entityculling.pw.toml":{"sha256":"53c120668de1d48e5cae23670ddd8e3282c7579d11d8e18d9d8d32000f31aa94","url":"https://cdn.modrinth.com/data/NNAgCjsB/versions/d20sUcYn/entityculling-fabric-1.6.2-mc1.20.jar"},"essential.pw.toml":{"sha256":"ba6eff01d1386d899be226640f512ee8add9173a06b5533538e7d17a1085ede2","url":"https://cdn.modrinth.com/data/k2ZPuTBm/versions/lLB4YANQ/essential_1-2-2-1_fabric_1-20-1.jar"},"fallingtree.pw.toml":{"sha256":"95f4c41606a6e0d58cfd91f459014b199ddf0ba217759e71b2d7602579d315f1","url":"https://cdn.modrinth.com/data/Fb4jn8m6/versions/kPSbFSaC/FallingTree-1.20.1-4.3.0.jar"},"fastanim.pw.toml":{"sha256":"c6af4d11f52a66bfa4f35e87fe6aa7132f74ff1f2dea3a3dd668a0d60e99017c","url":"https://cdn.modrinth.com/data/yHf7SALy/versions/5lHXCowj/lunade-fastanim-1.6-1.20.jar"},"fastload.pw.toml":{"sha256":"e13ab713f9779623de29bb50396b3202d670532bd4605f74c907d4f7834c1637","url":"https://cdn.modrinth.com/data/kCpssoSb/versions/ys9T20o4/Fastload%2B1.18.2-1.20-3.4.0.jar"},"ferrite-core.pw.toml":{"sha256":"efbf1d4df2a89621bb8d7090e04966795047db16513fef673a529a07dff66afe","url":"https://cdn.modrinth.com/data/uXXizFIs/versions/FCnCG6PS/ferritecore-6.0.0-fabric.jar"},"freecam.pw.toml":{"sha256":"e0b0c999809530038a982ded82569151630e4fc065cb06c10a3da1a54dee6a7e","url":"https://cdn.modrinth.com/data/XeEZ3fK2/versions/QkWJuaZ8/freecam-fabric-modrinth-1.2.1%2B1.20.jar"},"inspecio.pw.toml":{"sha256":"c442e5d4a3eaa92d039a95347fb18739a005436a4e02d5c5fa71a95c4ec6242e","url":"https://cdn.modrinth.com/data/a93H3mKU/versions/9fkuAmia/inspecio-1.8.1%2B1.20.jar"},"iris.pw.toml":{"sha256":"47fa8230a0ff0896a60d8822a19cc7587ed2a7a8d4f8187135a9afdea454278f","url":"https://cdn.modrinth.com/data/YL57xq9U/versions/P8R7yx6t/iris-mc1.20.1-1.6.9.jar"},"jade.pw.toml":{"sha256":"8eeb0b9ef783602f6a3d02f2893cd855f5b99051185e876adf733471ffaf9d60","url":"https://cdn.modrinth.com/data/nvQzSEkH/versions/SlsObyHn/Jade-1.20-fabric-11.6.0.jar"},"krypton.pw.toml":{"sha256":"69ad1810206ce12181b1b083640f044e7e250781c36c96c655eac36209057698","url":"https://cdn.modrinth.com/data/fQEb0iXm/versions/jiDwS0W1/krypton-0.2.3.jar"},"lambdabettergrass.pw.toml":{"sha256":"63df165b1f5cf800d23e95afdb808125b8dada7d86a94e347a2443af2c509485","url":"https://cdn.modrinth.com/data/2Uev7LdA/versions/Fhyj2P7Q/lambdabettergrass-1.5.2%2B1.20.1.jar"},"lambdynamiclights.pw.toml":{"sha256":"20433fb9a20f9450599bde4d8f0e8b0898eefdbda13e47d68430d31422c9f564","url":"https://cdn.modrinth.com/data/yBW8D80W/versions/mYl4RvKg/lambdynamiclights-2.3.2%2B1.20.1.jar"},"lithium.pw.toml":{"sha256":"a0c595355d680e0c87bf8eaebafedff6900d4e771a8d6894ee6d2d4374de8df9","url":"https://cdn.modrinth.com/data/gvQqBUqZ/versions/ZSNsJrPI/lithium-fabric-mc1.20.1-0.11.2.jar"},"memoryleakfix.pw.toml":{"sha256":"a9fadc6d369e6bbfb10eab4c00780c3295292c634b6551d2e1e2897ec38b63ab","url":"https://cdn.modrinth.com/data/NRjRiSSD/versions/dGlflhb6/memoryleakfix-fabric-1.17%2B-1.1.2.jar"},"modmenu.pw.toml":{"sha256":"a041b0f0305ffa5eb90120aa23768e1cfbb27583904b1751e3783c0f69382f1a","url":"https://cdn.modrinth.com/data/mOgUt4GM/versions/lEkperf6/modmenu-7.2.2.jar"},"moreculling.pw.toml":{"sha256":"8bd332613996b6da00318888f33c4704dba21083e1f7a2503969eb7c7d388cb0","url":"https://cdn.modrinth.com/data/51shyZVL/versions/Bu5pCvCn/moreculling-1.20.1-0.19.0.jar"},"mouse-wheelie.pw.toml":{"sha256":"2e9120be1b726df03753ab95585dea95643c6b4f8cb382eb84077926295db78a","url":"https://cdn.modrinth.com/data/u5Ic2U1u/versions/1uDKNRQF/mousewheelie-1.12.2%2Bmc1.20.1.jar"},"no-chat-reports.pw.toml":{"sha256":"8ff70525b0fbc5fa7592424872aa8092db1f7646d53817590bd9f9b88c75babc","url":"https://cdn.modrinth.com/data/qQyHxfxd/versions/HeZZR2kF/NoChatReports-FABRIC-1.20.1-v2.2.2.jar"},"not-enough-animations.pw.toml":{"sha256":"204ae3195b6c4b21bd7bdba78b6dc9194fe642526f2e828a20a1a145b86b5400","url":"https://cdn.modrinth.com/data/MPCX6s5C/versions/6auoqhMp/notenoughanimations-fabric-1.6.4-mc1.20.jar"},"ok-zoomer.pw.toml":{"sha256":"6bdcf8318dd7fa7c60487571556f4d81273a823273e6a03be7b3faf858273ce9","url":"https://cdn.modrinth.com/data/aXf2OSFU/versions/fGpO4l2z/ok_zoomer-5.0.0-beta.12%2B1.20.jar"},"qkl.pw.toml":{"sha256":"4913517acfaae53128e664f67423677ba9e1788188e1c3a885c20cedc0e99bf7","url":"https://cdn.modrinth.com/data/lwVhp9o5/versions/RYTef2Wb/quilt-kotlin-libraries-2.1.3%2Bkt.1.9.10%2Bflk.1.10.10.jar"},"qsl.pw.toml":{"sha256":"4c05e7655047dd22fefe4f2052ee092215817cb5286b17a43da36e612285fec8","url":"https://cdn.modrinth.com/data/qvIfYCYJ/versions/vTQynnGn/qfapi-7.2.2_qsl-6.1.2_fapi-0.88.1_mc-1.20.1.jar"},"quilt-loading-screen.pw.toml":{"sha256":"3ce9ec7fe5dec8bbfc58f90a75b5059e70b89b28b830a114c4a3a9fd9904319b","url":"https://cdn.modrinth.com/data/VPU6VYVP/versions/ZxKclDRW/quilt_loading_screen-6.0.0%2B1.20.1.jar"},"raised.pw.toml":{"sha256":"ab5f422051bf6c02e1815927cea771dd6c4bc4b39ae30b26d04a436baf231e29","url":"https://cdn.modrinth.com/data/nCQRBEiR/versions/l1xjmRyA/raised-fabric-1.20.1-2.0.0.jar"},"roughly-enough-items.pw.toml":{"sha256":"bf5ecca4e2c2be826f20715130bf590501798b0e4da0bc2452a9edd48481ca43","url":"https://cdn.modrinth.com/data/nfn13YXA/versions/bkWECOQH/RoughlyEnoughItems-12.0.659.jar"},"sodium.pw.toml":{"sha256":"b10e60b8000194bc617fd2c396a8584a5cc33a3118c8b382128452c3f93f881d","url":"https://cdn.modrinth.com/data/AANobbMI/versions/4OZL6q9h/sodium-fabric-mc1.20.1-0.5.3.jar"},"starlight.pw.toml":{"sha256":"2b4bb0256279b9edeec050ea02751119e4a7c6933a2b0d2905a72c56b14882d8","url":"https://cdn.modrinth.com/data/H8CaAYZC/versions/XGIsoVGT/starlight-1.1.2%2Bfabric.dbc156f.jar"},"visuality.pw.toml":{"sha256":"962b7f4406aa06787389d1ccd0f69ad9739341604ad82523df75b4a854111242","url":"https://cdn.modrinth.com/data/rI0hvYcd/versions/BipSJ05N/visuality-0.7.0%2B1.20.jar"},"vmp-fabric.pw.toml":{"sha256":"4b2a19188c20fc58870768e2b47bd0bf7ebd82edc406d3eaf5d6f0ec08ffbd59","url":"https://cdn.modrinth.com/data/wnEe9KBa/versions/sV8lIBhJ/vmp-fabric-mc1.20.1-0.2.0%2Bbeta.7.102-all.jar"},"xaeros-world-map.pw.toml":{"sha256":"bea7d315ce67220620f31e02e5c136db4a10ddabe77a156772b52588ccdcd83b","url":"https://cdn.modrinth.com/data/NcUtCpym/versions/L8OA3xGI/XaerosWorldMap_1.34.1_Fabric_1.20.jar"}}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 2f3abfc..f65ec12 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,18 +16,20 @@
       }
     },
     "packwiz2nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1683887515,
-        "narHash": "sha256-eYxlzal5DNUvpv3F9W42wREdRi6h1hceOcgoiN6gvRg=",
-        "owner": "getchoo",
-        "repo": "packwiz2nix",
-        "rev": "1c9c0ef2e40fbd1a921b446d8fe5884e645e4308",
-        "type": "github"
+        "lastModified": 1695101166,
+        "narHash": "sha256-Cd8WD1PPVMo5i+Jwa/UIJ1oGn5fUkBhaw882IjspaEU=",
+        "path": "/home/seth/repos/packwiz2nix",
+        "type": "path"
       },
       "original": {
-        "owner": "getchoo",
-        "repo": "packwiz2nix",
-        "type": "github"
+        "path": "/home/seth/repos/packwiz2nix",
+        "type": "path"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index cb8cbb3..0f246fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,20 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    packwiz2nix.url = "github:getchoo/packwiz2nix";
+    packwiz2nix = {
+      url = "github:getchoo/packwiz2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
     nixpkgs,
     packwiz2nix,
+    self,
     ...
   }: let
+    inherit (nixpkgs) lib;
+
     systems = [
       "x86_64-linux"
       "aarch64-linux"
@@ -18,37 +24,36 @@
       "aarch64-darwin"
     ];
 
-    forAllSystems = nixpkgs.lib.genAttrs systems;
-    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
-    inherit (packwiz2nix.lib) mkChecksumsApp mkMultiMCPack mkPackwizPackages;
+    forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});
   in {
-    apps = forAllSystems (s: let
-      pkgs = nixpkgsFor.${s};
+    packages = forAllSystems (pkgs: let
+      inherit (pkgs.stdenv.hostPlatform) system;
+
+      inherit
+        (packwiz2nix.lib.${system})
+        fetchPackwizModpack
+        mkMultiMCPack
+        ;
     in {
-      generate-checksums = mkChecksumsApp pkgs ./mods;
-    });
+      modpack = fetchPackwizModpack {
+        manifest = "${self}/pack.toml";
+        hash = "sha256-NVfgazU/mYs8rGBKNBgV+za+T4tmNLDPA8gz0699ZJs=";
+      };
 
-    packages = forAllSystems (s: let
-      pkgs = nixpkgsFor.${s};
-      mods = mkPackwizPackages pkgs ./checksums.json;
-    in rec {
-      getchoo-modpack = mkMultiMCPack {
-        inherit pkgs mods;
-        filesDir = ./files;
-        name = "getchoo-modpack";
+      modpack-zip = mkMultiMCPack {
+        src = self.packages.${system}.modpack;
+        instanceCfg = ./files/instance.cfg;
       };
 
-      default = getchoo-modpack;
+      default = self.packages.${system}.modpack-zip;
     });
 
-    devShells = forAllSystems (s: let
-      pkgs = nixpkgsFor.${s};
-      inherit (pkgs) mkShell;
-    in {
-      default = mkShell {
+    devShells = forAllSystems (pkgs: {
+      default = pkgs.mkShell {
         packages = with pkgs; [
           packwiz
-          p7zip
+          unzip
+          zip
         ];
       };
     });
diff --git a/index.toml b/index.toml
index b67aac3..13e0ec2 100644
--- a/index.toml
+++ b/index.toml
@@ -1,18 +1,6 @@
 hash-format = "sha256"
 
 [[files]]
-file = "files/.packignore"
-hash = "9280b57f3953a92e4c50112002012ae86f673b5c4055b4618c9c4c55f361512d"
-
-[[files]]
-file = "files/instance.cfg"
-hash = "4554f7e3edc9590887e2d6f536bfe37840ab39fd2b57aa420afac09b32dc4d39"
-
-[[files]]
-file = "files/mmc-pack.json"
-hash = "08068b4a5065a38836a0072279adda2637d66a4e8331e4bfb499ce6b6adc4fd0"
-
-[[files]]
 file = "mods/appleskin.pw.toml"
 hash = "6869de1ca55dc09beabb3c234727e84be4d4fbdcbad2c8081c03010713f374e1"
 metafile = true
diff --git a/pack.toml b/pack.toml
index 5e15156..f825fdd 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "64bac3fed73caba5f4ada39a1329380ee4f5ddaba32b706e140e697f93341482"
+hash = "5e1d963a267bce18394468f4ee8654efb5d301640eb1c1a9741d152334f04dab"
 
 [versions]
 minecraft = "1.20.1"