diff --git a/flake.lock b/flake.lock index f62596a..0d9c107 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "crane_2": { "locked": { - "lastModified": 1766194365, - "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", "owner": "ipetkov", "repo": "crane", - "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1766825157, - "narHash": "sha256-pm6K7ziSjlXyJCb4BlRM4gZCwkGhTedX8KY++4Roa3A=", + "lastModified": 1767012911, + "narHash": "sha256-+olVAh2dL9mg7C94bMYFpfzqaplHVigtUSpszS86xDM=", "owner": "nix-community", "repo": "flakelight", - "rev": "48f79201ad4d46783e9d76f10f4df7e1f3985f26", + "rev": "1eb3dee6b0dfbae9d0cb0c139a816ea62c5aa7ca", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1766980997, - "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", + "lastModified": 1767048910, + "narHash": "sha256-KLFTeA/xquN+F3XHLAXcserk0L0nijbhzuldxNDF1eE=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", + "rev": "d99b4ca5debaa082c7d76015aa2b7f3fc7e8b5f7", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766582277, - "narHash": "sha256-mUZRMKId7Uycwnt31RytPwhmY/8UTbk92ckZWHoS0Eg=", + "lastModified": 1767013031, + "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4c78502846c1ef668eedbd4f55d818ebac5388ac", + "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", "type": "github" }, "original": { @@ -480,11 +480,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766968208, - "narHash": "sha256-WM6X8mnpjmCU+fpaFNH4w2R7GVJllXtv4UKRIPmbCIo=", + "lastModified": 1767077227, + "narHash": "sha256-wdUitn3XbaC99X0ctfHf0q5lGQ/1ogUwzjqTD4bkrDg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "503a635a4a734f4e8852f4387886ab9f58724da5", + "rev": "9c4cb4a2b1adf7a24064a8cf5c829f464622d520", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766751930, - "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=", + "lastModified": 1767072131, + "narHash": "sha256-JEpNneZyi8ydU0VVpxrHis2panjmeagFLGAiqigWMbE=", "owner": "YaLTeR", "repo": "niri", - "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1", + "rev": "1ab1737653d8727c63252fb569e011c0903a9ace", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767070591, + "narHash": "sha256-b0aM3221Pw6vbACFqZrVzZjMNqXVPi1dvgLr8QTbajc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "9b3c38bf6c260d0e88154ef07fa833fa845bfd14", "type": "github" }, "original": { @@ -579,11 +579,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1766736597, - "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", + "lastModified": 1766885793, + "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", + "rev": "9ef261221d1e72399f2036786498d78c38185c46", "type": "github" }, "original": { @@ -602,11 +602,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1766941632, - "narHash": "sha256-QB8XEoY5D2iRYntcKzJ5wlvgpqqQSe0P0h5CvBO/rUk=", + "lastModified": 1767002962, + "narHash": "sha256-HGFRwMRUwt56E+SiVX9YQOzpOwHy0/rtEqMoEbkF8Yg=", "owner": "nix-community", "repo": "nixvim", - "rev": "ff75a5d3cc674391814c4703464ea1a3db204078", + "rev": "63c957603751f0a107c4d9c2cbaff1c8749fc9f1", "type": "github" }, "original": { @@ -804,11 +804,11 @@ ] }, "locked": { - "lastModified": 1766285238, - "narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", + "lastModified": 1766976750, + "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", + "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", "type": "github" }, "original": { @@ -838,11 +838,11 @@ "prismlauncher-meta": "prismlauncher-meta" }, "locked": { - "lastModified": 1766997046, - "narHash": "sha256-2SmSOtkzDd5H+3bgIJ6o7rUzzbkH1Z4YAsiHHOdCFn0=", + "lastModified": 1767004101, + "narHash": "sha256-Q4KqZnTELWzEeGqhU6hSdlt3bFOqxF1qXRxnK8LFQhY=", "ref": "refs/heads/main", - "rev": "2969e5a22668b46310dbb23425846e7291801d81", - "revCount": 349, + "rev": "b43348232664596e9c638da5b68a9703732d4c03", + "revCount": 351, "type": "git", "url": "https://codeberg.org/spoonbaker/mono" }, diff --git a/homeModules/dev.nix b/homeModules/dev.nix index 65532fb..aec5ef2 100644 --- a/homeModules/dev.nix +++ b/homeModules/dev.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{inputs, outputs, ...}: { config, lib, pkgs, @@ -16,6 +16,7 @@ python = mkLangOpt "Python dev stuff"; dotnet = mkLangOpt ".NET dev stuff"; cutter = mkLangOpt "Cutter"; + mc = lib.mkEnableOption "Minecraft modpack stuff"; }; config = let @@ -68,6 +69,11 @@ gcc gdb ]) + ++ (lib.optionals conf.mc [ + outputs.packages.${pkgs.system}.packwiz + inputs.spoon.packages.${pkgs.system}.mc-srv-git-hook.passthru.mrpack-install' + jre + ]) ++ (lib.optionals conf.rust [ (pkgs.fenix.complete.withComponents [ "cargo" diff --git a/nixosConfigurations/aperture.nix b/nixosConfigurations/aperture.nix index 938f11d..76188a8 100644 --- a/nixosConfigurations/aperture.nix +++ b/nixosConfigurations/aperture.nix @@ -33,6 +33,7 @@ enable = true; dev-name = "APERTURE"; }; + dev.mc = true; }; home-manager.users.bean.programs.niri.settings.outputs."eDP-1".scale = 1; diff --git a/packages/packwiz.nix b/packages/packwiz.nix new file mode 100644 index 0000000..c243f6f --- /dev/null +++ b/packages/packwiz.nix @@ -0,0 +1,13 @@ +{ packwiz, fetchFromGitHub, ... }: +packwiz.overrideAttrs (prev: next: { + version = "0-unstable-2025-11-24"; + + src = fetchFromGitHub { + owner = "packwiz"; + repo = "packwiz"; + rev = "52b123018f9e19b49703f76e78ad415642acf5c5"; + sha256 = "sha256-EVs2PngdapCUSf6J946rpJWnEbM8TtlDQQS/Zg16Qfs="; + }; + + vendorHash = "sha256-P1SsvHTYKUoPve9m1rloBfMxUNcDKr/YYU4dr4vZbTE="; +})