Move some things around

catgirl-v · Feb 3, 2025 · 0d53ad0 · 0d53ad0
1 parent 30fa34e
commit 0d53ad0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/packages.nix b/packages.nix
@@ -86,7 +86,7 @@ lib.makeScope newScope (
 
         postPatch = ''
           patchShebangs --build .
-          cp -r ${escapeStorePath ./overlay}/. .
+          cp -r ${escapeStorePath ./src_overlay}/. .
           rm config-overrides/*/difficultylock.json5
         '';
         dontConfigure = true;
@@ -111,12 +111,12 @@ lib.makeScope newScope (
             rm -r config-overrides manifest.json modlist.html
 
             # `packwiz init` tries to go online so we have to do this
-            substitute ${escapeStorePath ./pack.toml.in} pack.toml \
+            substitute ${escapeStorePath ./packwiz/pack.toml.in} pack.toml \
               --subst-var-by mc_version "$(jq -r '.minecraft.version' "$src/manifest.json")" \
               --subst-var-by forge_version "$(jq -r '.minecraft.modLoaders[0].id | sub("^forge-"; "")' "$src/manifest.json")"
             : > index.toml
-            python3 ${escapeStorePath ./gen_pw_mods.py} ${escapeStorePath ./mods.json}
-            substitute ${escapeStorePath ./forge-installer.pw.toml.in} forge-installer.pw.toml \
+            python3 ${escapeStorePath ./packwiz/gen_pw_mods.py} ${escapeStorePath ./mods.json}
+            substitute ${escapeStorePath ./packwiz/forge-installer.pw.toml.in} forge-installer.pw.toml \
               --subst-var-by url ${escapeShellArg forgeServer.src.url} \
               --subst-var-by hash ${escapeShellArg forgeServer.src.outputHash}
             packwiz refresh

diff --git a/forge-installer.pw.toml.in → packwiz/forge-installer.pw.toml.in b/forge-installer.pw.toml.in → packwiz/forge-installer.pw.toml.in
diff --git a/gen_pw_mods.py → packwiz/gen_pw_mods.py b/gen_pw_mods.py → packwiz/gen_pw_mods.py
diff --git a/pack.toml.in → packwiz/pack.toml.in b/pack.toml.in → packwiz/pack.toml.in
diff --git a/...y/config/giacomos_speedometer-client.toml → ...y/config/giacomos_speedometer-client.toml b/...y/config/giacomos_speedometer-client.toml → ...y/config/giacomos_speedometer-client.toml
diff --git a/overlay/config/invtweaks-client.toml → src_overlay/config/invtweaks-client.toml b/overlay/config/invtweaks-client.toml → src_overlay/config/invtweaks-client.toml
diff --git a/overlay/manifest.json → src_overlay/manifest.json b/overlay/manifest.json → src_overlay/manifest.json