From 4ccfccb6a820c3b5de3e17c60ea3621125a8dcae Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 7 Jan 2024 23:35:05 -0500
Subject: update to 1.20.4 and move to fabric

---
 flake.nix | 46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index cb8cbb3..46d1772 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,9 @@
 {
   description = "getchoo's modpack";
 
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-    packwiz2nix.url = "github:getchoo/packwiz2nix";
-  };
+  inputs.nixpkgs.url = "nixpkgs/nixpkgs-unstable";
 
-  outputs = {
-    nixpkgs,
-    packwiz2nix,
-    ...
-  }: let
+  outputs = {nixpkgs, ...}: let
     systems = [
       "x86_64-linux"
       "aarch64-linux"
@@ -18,38 +11,11 @@
       "aarch64-darwin"
     ];
 
-    forAllSystems = nixpkgs.lib.genAttrs systems;
-    nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
-    inherit (packwiz2nix.lib) mkChecksumsApp mkMultiMCPack mkPackwizPackages;
+    forAllSystems = nixpkgs.lib.genAttrs systems (system: nixpkgs.legacyPackages.${system});
   in {
-    apps = forAllSystems (s: let
-      pkgs = nixpkgsFor.${s};
-    in {
-      generate-checksums = mkChecksumsApp pkgs ./mods;
-    });
-
-    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";
-      };
-
-      default = getchoo-modpack;
-    });
-
-    devShells = forAllSystems (s: let
-      pkgs = nixpkgsFor.${s};
-      inherit (pkgs) mkShell;
-    in {
-      default = mkShell {
-        packages = with pkgs; [
-          packwiz
-          p7zip
-        ];
+    devShells = forAllSystems (pkgs: {
+      default = pkgs.mkShell {
+        packages = [pkgs.packwiz];
       };
     });
   };
-- 
cgit v1.2.3