feat: start using packwiz2nix

10 files changed, 91 insertions, 25 deletions

diff --git a/.github/workflows/build-modpack.yml b/.github/workflows/build-modpack.yml
index 35fbf02..aace7f9 100644
--- a/.github/workflows/build-modpack.yml
+++ b/.github/workflows/build-modpack.yml
@@ -1,7 +1,10 @@
-name: build modpack
+name: Build modpack
 
 on:
   push:
+    paths:
+      # only run when prismlauncher modpack files are changed
+      - nix/files/**
   workflow_dispatch:
 
 jobs:
@@ -14,7 +17,7 @@ jobs:
 
       - name: build
         run: |
-          nix build .#getchoo-modpack
+          nix build
 
       - name: upload
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/update-checksums.yml b/.github/workflows/update-checksums.yml
new file mode 100644
index 0000000..7a5b9a3
--- /dev/null
+++ b/.github/workflows/update-checksums.yml
@@ -0,0 +1,33 @@
+name: Update mod checksums
+
+on:
+  push:
+    paths:
+      # only run when mod files are changed
+      - mods/**
+  workflow_dispatch:
+  workflow_run:
+    workflows: ["Update mods"]
+    types:
+      - completed
+
+permissions:
+  contents: write
+
+jobs:
+  build-modpack:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+
+      - name: generate new checksums
+        run: |
+          nix run --impure .#generate-checksums
+
+      - name: commit changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          default_author: github_actions
+          message: "chore(flake): update mod checksums"
diff --git a/.github/workflows/update-mods.yml b/.github/workflows/update-mods.yml
index 9fbfea5..03c3df4 100644
--- a/.github/workflows/update-mods.yml
+++ b/.github/workflows/update-mods.yml
@@ -1,27 +1,27 @@
 name: Update mods
 
 on:
-  workflow_dispatch:
   schedule:
+    # run daily at 0:00 utc
     - cron: "0 0 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write
 
 jobs:
   update-mods:
     runs-on: ubuntu-latest
     steps:
-      - name: get packwiz
-        run: |
-          curl -fsSLo ~/packwiz.zip https://nightly.link/packwiz/packwiz/workflows/go/main/Linux%2064-bit%20x86.zip
-          unzip -d ~ ~/packwiz.zip
-          chmod 755 ~/packwiz
-
       - uses: actions/[email protected]
+      - uses: cachix/install-nix-action@v20
 
-      - name: update mods
+      - name: update
         run: |
-          echo "y" | ~/packwiz update --all
+          echo "y" | nix run nixpkgs#packwiz -- update --all
 
-      - uses: EndBug/add-and-commit@v9
+      - name: commit changes
+        uses: EndBug/add-and-commit@v9
         with:
           default_author: github_actions
           message: "chore: update mods"
diff --git a/.packwizignore b/.packwizignore
index 30994a0..5547814 100644
--- a/.packwizignore
+++ b/.packwizignore
@@ -1,2 +1,7 @@
 /README.md
 /LICENSE
+/nix
+/.github
+/flake.nix
+/flake.lock
+/checksums.json
diff --git a/checksums.json b/checksums.json
new file mode 100644
index 0000000..ff2b192
--- /dev/null
+++ b/checksums.json
@@ -0,0 +1 @@
+{"advancements-debug.pw.toml":{"sha256":"7d7d9ac9ee310cbdd0b96bf9807c714f71216b4decfbf1da535561afb4d36ba6","url":"https://cdn.modrinth.com/data/rxMTwxyO/versions/2.3.0/advdebug-2.3.0.jar"},"animatica.pw.toml":{"sha256":"466e4e67b4da5593272c8db83560d3f7b61011f345601645f7e5b39173041c1c","url":"https://cdn.modrinth.com/data/PRN43VSY/versions/0.5%2B1.19/animatica-0.5%2B1.19.jar"},"appleskin.pw.toml":{"sha256":"e71e9963e24f9a9b8f471709ae1340b0be3093d00c53e23687a638de9e925126","url":"https://cdn.modrinth.com/data/EsAfCjCV/versions/ntsDU1AP/appleskin-fabric-mc1.19.3-2.4.2.jar"},"architectury-api.pw.toml":{"sha256":"ae9c03988051014da6ab2e55a68ca45610426ad211ad774626e80b8d13b0b158","url":"https://cdn.modrinth.com/data/lhGA9TYQ/versions/97NYBivp/architectury-7.1.78-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":"cd9687d8216ad8a9f56453d9409bb39b4ee3858afe40fe27811860f4e250c480","url":"https://cdn.modrinth.com/data/MS1ZMyR7/versions/UCr9wrly/BetterPingDisplay-Fabric-1.19.3-1.1.1.jar"},"blanket.pw.toml":{"sha256":"0266f0fdf719dc3f4045099546843a7606b87a4bcabf813000b0eaceb1bc214c","url":"https://cdn.modrinth.com/data/gxpkKtVH/versions/HxqAwjsx/Blanket%2BClient%2Btweaks-1.1.3.jar"},"c2me-fabric.pw.toml":{"sha256":"61726c969ba70df2a485f642b052a33edb2a15734735153a478d5f31b51b29ad","url":"https://cdn.modrinth.com/data/VSNURh3q/versions/FpgVeSQK/c2me-fabric-mc1.19.3-0.2.0%2Balpha.10.0.jar"},"cit-resewn.pw.toml":{"sha256":"368044b3ac53aa22f4bd29ea5834f56072bc5640cf9dbde2e0bd8303c7d438e9","url":"https://cdn.modrinth.com/data/otVJckYQ/versions/hGatm5K8/CITResewn-1.1.3%2B1.19.3.jar"},"cloth-config.pw.toml":{"sha256":"520781f48186929ad78274d703dfea4226b15b978ad68743c03e71032ef21778","url":"https://cdn.modrinth.com/data/9s6osm5g/versions/M3yxljrZ/cloth-config-9.0.94-fabric.jar"},"continuity.pw.toml":{"sha256":"597b98ec721cd7ea6658c12306a0c434f0fb7153bb9be5a45212b66c52108a1d","url":"https://cdn.modrinth.com/data/1IjD5062/versions/4h5IIa7B/continuity-3.0.0-beta.2%2B1.19.3.jar"},"cull-leaves.pw.toml":{"sha256":"bb790b4eebf8393e71ec7bdbae5ab49bdefed268804d5fe1cfbec5256e13c115","url":"https://cdn.modrinth.com/data/GNxdLCoP/versions/DK6h46LO/cullleaves-quilt-3.0.3.jar"},"debugify.pw.toml":{"sha256":"de0c065083bd8fc042d020e842ef3fe11252f5138a0e98c3c43a7843230c1085","url":"https://cdn.modrinth.com/data/QwxR6Gcd/versions/fgjgGIfI/Debugify-1.19.3%2B1.1.jar"},"dynamic-fps.pw.toml":{"sha256":"596c2924bad607f5820dc57f0b04387cbfc12894946970dde1e5050818196f7b","url":"https://cdn.modrinth.com/data/LQ3K71Q1/versions/2.2.0/dynamic-fps-2.2.0.jar"},"ebe.pw.toml":{"sha256":"f02caa84c0171aaa7090429a5d82224777854146f442938b149f4decf95a7327","url":"https://cdn.modrinth.com/data/OVuFYfre/versions/6NvQpIBY/enhancedblockentities-0.8%2B1.19.3.jar"},"entityculling.pw.toml":{"sha256":"4ab7d3aa4ee738e52ff48922a94e573967160ab28a8d742bf19e2207411514d1","url":"https://cdn.modrinth.com/data/NNAgCjsB/versions/AdkBUIRs/entityculling-fabric-1.6.1-mc1.19.3.jar"},"entitytexturefeatures.pw.toml":{"sha256":"a92a49fa8e7ff3b96d3d15dc57732b180218d934667eb15900d7c75948fc75a4","url":"https://cdn.modrinth.com/data/BVzZfTc1/versions/qDWfufU7/entity_texture_features_fabric_1.19.3-4.4.0.jar"},"essential.pw.toml":{"sha256":"255b3b4733ff0412d59c24e586f3ce811dc4292abb57a9ce3bd6ecbd6871f1ed","url":"https://cdn.modrinth.com/data/k2ZPuTBm/versions/1.0.0/Essential-fabric_1-19.jar"},"fabricskyboxes.pw.toml":{"sha256":"72f870e634d29e44f04f6635f0d8e602b6d95213cf66fa6b9d4edc2ec80e65d6","url":"https://cdn.modrinth.com/data/YBz7DOs8/versions/EZF3YEvO/fabricskyboxes-0.6.5%2Bmc1.19.3.jar"},"fallingtree.pw.toml":{"sha256":"36615e4cbdfe9061346b49c651d1c4ee3dadb58187220707177151072cd44349","url":"https://cdn.modrinth.com/data/Fb4jn8m6/versions/cMkbt0f5/FallingTree-1.19.3-3.11.2.jar"},"fastanim.pw.toml":{"sha256":"26fbabfd428545e84d4e937ad14b2011e9fa481a250d059e076636e13465fe36","url":"https://cdn.modrinth.com/data/yHf7SALy/versions/uralQ5Oz/lunade-fastanim-1.5.7-1.19.3.jar"},"fastload.pw.toml":{"sha256":"e260050d41335adbd4d1fb921c998960569d71031bb4ec783f56daab47ecadbe","url":"https://cdn.modrinth.com/data/kCpssoSb/versions/u4FVRRGd/Fastload%2B1.18.2-1.20-3.3.8.jar"},"ferrite-core.pw.toml":{"sha256":"ac4e8e3d91de2ee6ee6a4f69c079b3c7b31de67f97ce9d65be8e75538e6e5fac","url":"https://cdn.modrinth.com/data/uXXizFIs/versions/GHcKib6J/ferritecore-5.1.0-fabric.jar"},"freecam.pw.toml":{"sha256":"38e6d54bfd1a0d9b9d74c8d60f5c67452cca5a9a175d0b13c815cc427db643f9","url":"https://cdn.modrinth.com/data/XeEZ3fK2/versions/i5zlkMq3/freecam-fabric-modrinth-1.1.8%2B1.19.jar"},"inspecio.pw.toml":{"sha256":"12774f4f3573efed6fc5c04f119f6923c5b8c204e9f423eb81bfe20603dac856","url":"https://cdn.modrinth.com/data/a93H3mKU/versions/qzj98tcl/inspecio-1.7.0%2B1.19.3.jar"},"iris.pw.toml":{"sha256":"5c2de6e491b31f9d981895481199d06c1e3032b3797609d8dfd219e4c04538f1","url":"https://cdn.modrinth.com/data/YL57xq9U/versions/ExtC2pRY/iris-mc1.19.3-1.5.2.jar"},"jade.pw.toml":{"sha256":"b79669785d9cec7b7c4726482b49b66951cd5b4a4f34c7a404ef160d31f5cef1","url":"https://cdn.modrinth.com/data/nvQzSEkH/versions/HIL9jJQF/Jade-1.19.3-fabric-9.4.1.jar"},"koro-utils-lib.pw.toml":{"sha256":"a3324ac9f91552d046a5535cbc990c0c31f24c562eb81f1a1f28a9428d3b845b","url":"https://cdn.modrinth.com/data/viTMf4AE/versions/zlKrZiOd/koro-utils-lib-1.1.0.jar"},"krypton.pw.toml":{"sha256":"683f7578ac010137328f1613ee8337473119f4c95986ab2fc46413b2a7831c9a","url":"https://cdn.modrinth.com/data/fQEb0iXm/versions/0.2.1/krypton-0.2.1.jar"},"lambdabettergrass.pw.toml":{"sha256":"8caa7bedce6feb51948156417a7b009daa700e3801f410c167d693ff19661ae7","url":"https://cdn.modrinth.com/data/2Uev7LdA/versions/lshdVWEE/lambdabettergrass-1.4.0%2B1.19.3.jar"},"lambdynamiclights.pw.toml":{"sha256":"d80ed4462063f7cf1a838641834756d8988d6ca4465eb789b35a8c6fa50986eb","url":"https://cdn.modrinth.com/data/yBW8D80W/versions/9E1ECN95/lambdynamiclights-2.2.0%2B1.19.3.jar"},"lazydfu.pw.toml":{"sha256":"4f3b77273b57d019a8db58371e63e4426557c1bb7c9cc10536a03972122778c8","url":"https://cdn.modrinth.com/data/hvFnDODi/versions/0.1.3/lazydfu-0.1.3.jar"},"lithium.pw.toml":{"sha256":"90f3b6046528ca819c82e1920898f1db64ba6bc4dad91dbe63d2f100f66d071a","url":"https://cdn.modrinth.com/data/gvQqBUqZ/versions/53cwYYb1/lithium-fabric-mc1.19.3-0.11.1.jar"},"memoryleakfix.pw.toml":{"sha256":"44f10d648e342f9876c8885b235dd6dd7866362e91958242159670f251559366","url":"https://cdn.modrinth.com/data/NRjRiSSD/versions/PtXTwQt6/memoryleakfix-fabric-1.17%2B-1.0.0.jar"},"midnightlib.pw.toml":{"sha256":"196a5da7fb80f809485a2c3fde1ba1a0895755e30a0a51bc5992a8f878c768e1","url":"https://cdn.modrinth.com/data/codAaoxh/versions/e50cGA1L/midnightlib-quilt-1.1.0.jar"},"modmenu.pw.toml":{"sha256":"42768f23950250400c8ac4319a67100c932187bac10b2b8cd4b42d099b65c2e4","url":"https://cdn.modrinth.com/data/mOgUt4GM/versions/RtaGQNyd/modmenu-5.1.0-beta.4.jar"},"moreculling.pw.toml":{"sha256":"79a846415c8b9b08724c34a8184643bd000ef6cf1cd598c5d892542ef89b8818","url":"https://cdn.modrinth.com/data/51shyZVL/versions/tPdgUkgf/moreculling-1.19.3-0.17.0.jar"},"mouse-wheelie.pw.toml":{"sha256":"17adb3040c528382bd085054233d3755b22711c2ded1e4d5bcb4c86a37699c27","url":"https://cdn.modrinth.com/data/u5Ic2U1u/versions/pgVpuqvW/mousewheelie-1.10.7%2Bmc1.19.3.jar"},"no-chat-reports.pw.toml":{"sha256":"ba1fb3c1565cdb3905f651977330a7d524fe6b340d5f12e0b84f54e045997e18","url":"https://cdn.modrinth.com/data/qQyHxfxd/versions/uVt4LKvF/NoChatReports-FABRIC-1.19.3-v2.0.0.jar"},"not-enough-animations.pw.toml":{"sha256":"b075cbdc0e35bff3f9f3f9fc4064d17dddca4c7d61ad038ff9eb6a0c238df6e2","url":"https://cdn.modrinth.com/data/MPCX6s5C/versions/LxB5Tojq/notenoughanimations-fabric-1.6.3-mc1.19.3.jar"},"ok-zoomer.pw.toml":{"sha256":"926f8fc19935b2d8d9dc00bc8fae41eadf55fcc8c5eb5114bc01594351fec52e","url":"https://cdn.modrinth.com/data/aXf2OSFU/versions/oOWfXNvO/ok_zoomer-5.0.0-beta.10%2B1.19.3.jar"},"qsl.pw.toml":{"sha256":"beb3c9f332a86628349502a75d337fc522109b10d6c1aa2b7878470f8e27ac80","url":"https://cdn.modrinth.com/data/qvIfYCYJ/versions/eaoB99I6/qfapi-5.0.0-beta.9_qsl-4.0.0-beta.13_fapi-0.76.0_mc-1.19.3.jar"},"quilt-loading-screen.pw.toml":{"sha256":"3bb8306ec883da6fe1fb2b293299e28337c890cc34d38da8f475c80ec140ff96","url":"https://cdn.modrinth.com/data/VPU6VYVP/versions/1ni9FR83/quilt_loading_screen-5.0.0%2B1.19.3-rc1.jar"},"raised.pw.toml":{"sha256":"b836855efa53fd90a82cb51ba85604b218fea519faf07ff0cbd76d26b4aa06a2","url":"https://cdn.modrinth.com/data/nCQRBEiR/versions/n3qWKnBY/raised-fabric-1.19.3-1.2.2.jar"},"roughly-enough-items.pw.toml":{"sha256":"a777fed7a7051a8154d9fbe64583dbfdea124b8b7c8279a11d7d19063a167167","url":"https://cdn.modrinth.com/data/nfn13YXA/versions/SwfEZvCy/RoughlyEnoughItems-10.0.596.jar"},"smoothboot-fabric.pw.toml":{"sha256":"335d680c9e9d8016b2cf3019f3b0799ea1ad9c8b08b3f37187234abf7b4e0c1d","url":"https://cdn.modrinth.com/data/FWumhS4T/versions/1.19-1.7.1/smoothboot-fabric-1.19-1.7.1.jar"},"sodium.pw.toml":{"sha256":"fd3d94aee11b26be0e871d9f9a7d3441c99ab9d2902836ea4e7788a4336f00ac","url":"https://cdn.modrinth.com/data/AANobbMI/versions/9T4NlR7l/sodium-fabric-mc1.19.3-0.4.11%2Bbuild.25.jar"},"starlight.pw.toml":{"sha256":"f2dd6682941326a833aaba868339b4ad9c93882fdef4447120ca0a8dea633a42","url":"https://cdn.modrinth.com/data/H8CaAYZC/versions/1.1.1%2B1.19/starlight-1.1.1%2Bfabric.ae22326.jar"},"thorium.pw.toml":{"sha256":"5a35242c6be18ad51a4c06f0931b149e0cb93c16a6ac57f93f4acad83c6a7086","url":"https://cdn.modrinth.com/data/ImUQFWcy/versions/ChzyZR8C/thorium-1.4.0.jar"},"visuality.pw.toml":{"sha256":"9fbdade18c7271d3b7377e692eb4755a3d271d6ce8c05c8aa67ec2fb2d5a3899","url":"https://cdn.modrinth.com/data/rI0hvYcd/versions/hUOnkzoj/visuality-0.6.1.jar"},"vmp-fabric.pw.toml":{"sha256":"56d2a20a324422aa009fb769b19c45faa48f847bdf9e9bb82d1f93e4d5091ce6","url":"https://cdn.modrinth.com/data/wnEe9KBa/versions/tcCOpTom/vmp-fabric-mc1.19.3-0.2.0%2Bbeta.7.46-all.jar"},"xaeros-world-map.pw.toml":{"sha256":"72b8646de83a2514b828272343011a6b04c6d5d717c484e86873642bbf0fcd49","url":"https://cdn.modrinth.com/data/NcUtCpym/versions/YSvtDiDJ/XaerosWorldMap_1.30.1_Fabric_1.19.3.jar"},"yacl.pw.toml":{"sha256":"8d245a452effa3fce23ea7ca773d9713819740373159be98f5d731d1d481af90","url":"https://cdn.modrinth.com/data/1eAoo2KR/versions/3EWbdCzX/YetAnotherConfigLib-2.2.0.jar"}}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 430df0b..8c8749a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,9 +15,25 @@
         "type": "indirect"
       }
     },
+    "packwiz2nix": {
+      "locked": {
+        "lastModified": 1683785033,
+        "narHash": "sha256-2j1kcX5A8rjUCYfoGXg/Nymb6S9kfn4dRRHkMM5hlBY=",
+        "owner": "getchoo",
+        "repo": "packwiz2nix",
+        "rev": "a0c9b2378a0d1b3e57fda1d377b9914e3bc141b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "getchoo",
+        "repo": "packwiz2nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "packwiz2nix": "packwiz2nix"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 74ffdfb..c956f57 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,16 @@
 {
   description = "getchoo's modpack";
 
-  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    packwiz2nix.url = "github:getchoo/packwiz2nix";
+  };
 
   outputs = {
     self,
     nixpkgs,
+    packwiz2nix,
+    ...
   }: let
     version = self.lastModifiedDate;
     systems = [
@@ -18,10 +23,17 @@
     forAllSystems = nixpkgs.lib.genAttrs systems;
     nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
   in {
-    packages = forAllSystems (s: let
+    apps = forAllSystems (s: let
       pkgs = nixpkgsFor.${s};
     in {
+      generate-checksums = packwiz2nix.lib.mkChecksumsApp pkgs ./mods;
+    });
+
+    packages = forAllSystems (s: let
+      pkgs = nixpkgsFor.${s};
+    in rec {
       getchoo-modpack = pkgs.callPackage ./nix {inherit version;};
+      default = getchoo-modpack;
     });
 
     devShells = forAllSystems (s: let
diff --git a/index.toml b/index.toml
index be96446..9e2a86d 100644
--- a/index.toml
+++ b/index.toml
@@ -1,10 +1,6 @@
 hash-format = "sha256"
 
 [[files]]
-file = ".github/workflows/update-mods.yml"
-hash = "f2522f4a6a293a0234c18fe38e6d13cf99309116532629e9325dcba1fa4225c8"
-
-[[files]]
 file = "mods/advancements-debug.pw.toml"
 hash = "f6620ab34805ef3a7c88b8a83c044e69f15c2034af90bd55820041469e8357fa"
 metafile = true
@@ -261,7 +257,7 @@ metafile = true
 
 [[files]]
 file = "mods/xaeros-world-map.pw.toml"
-hash = "685bc10fac453d4c1ef0300072375ef3d3f377b66ae306547185cb51a1fa145b"
+hash = "e36dc50dcfcfd327c3434ef98b477e41359ef22670ba77995c62116a976aec15"
 metafile = true
 
 [[files]]
diff --git a/mods/xaeros-world-map.pw.toml b/mods/xaeros-world-map.pw.toml
index 9c669a9..e1d7222 100644
--- a/mods/xaeros-world-map.pw.toml
+++ b/mods/xaeros-world-map.pw.toml
@@ -3,11 +3,11 @@ filename = "XaerosWorldMap_1.30.1_Fabric_1.19.3.jar"
 side = "both"
 
 [download]
+url = "https://cdn.modrinth.com/data/NcUtCpym/versions/YSvtDiDJ/XaerosWorldMap_1.30.1_Fabric_1.19.3.jar"
 hash-format = "sha1"
 hash = "b5ae042bb1fbe7999471d217f6494912b22a099f"
-mode = "metadata:curseforge"
 
 [update]
-[update.curseforge]
-file-id = 4516866
-project-id = 317780
+[update.modrinth]
+mod-id = "NcUtCpym"
+version = "YSvtDiDJ"
diff --git a/pack.toml b/pack.toml
index 24b6d75..df17738 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 = "1850eec0e10b525740a16fad311ecb218046a83507c9018e613b24533e634670"
+hash = "9e042b39a3e970f53ccbb198411fbadcd395af588e45515d7e6aaed0c7f17733"
 
 [versions]
 minecraft = "1.19.3"