nix: backport some patches from upstream

Author: moni-dz

flake.lock

@@ -40,18 +40,20 @@
   inputs = {
     # Flake inputs
     agenix.url = "github:ryantm/agenix";
-    crowdsec.url = "git+https://codeberg.org/kampka/nix-flake-crowdsec.git";
     darwin.url = "github:lnl7/nix-darwin";
     home.url = "github:nix-community/home-manager/master";
-    nix.url = "github:nixos/nix/master";
+    nix.url = "github:NixOS/nix/master";
     nix-colors.url = "github:Misterio77/nix-colors";
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     nixos-wsl.url = "github:nix-community/nixos-wsl";
     parts.url = "github:hercules-ci/flake-parts";
 
     # Non-flake inputs
-    infuse = { url = "git+https://codeberg.org/amjoseph/infuse.nix.git"; flake = false; };
+    infuse = {
+      url = "git+https://codeberg.org/amjoseph/infuse.nix.git";
+      flake = false;
+    };
 
     # Nixpkgs branches
     master.url = "github:nixos/nixpkgs/master";
@@ -62,10 +64,10 @@
     # Minimize duplicate instances of inputs
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.inputs.darwin.follows = "darwin";
-    crowdsec.inputs.nixpkgs.follows = "nixpkgs";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     home.inputs.nixpkgs.follows = "nixpkgs";
     nix.inputs.nixpkgs.follows = "nixpkgs";
+    nix.inputs.flake-parts.follows = "parts";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
     nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";

flake.nix

@@ -49,23 +49,25 @@
         };
       in
       {
-        bettermc = let
-          modpack = pkgs.fetchPackwizModpack {
-            url = "https://raw.githubusercontent.com/moni-dz/bmc3-packwiz/refs/heads/master/pack.toml";
-            packHash = "";
-          };
-        in {
-          enable = true;
-          autoStart = true;
-          package = pkgs.fabricServers.fabric-1_21_1;
-          openFirewall = true;
+        bettermc =
+          let
+            modpack = pkgs.fetchPackwizModpack {
+              url = "https://raw.githubusercontent.com/moni-dz/bmc3-packwiz/refs/heads/master/pack.toml";
+              packHash = "";
+            };
+          in
+          {
+            enable = true;
+            autoStart = true;
+            package = pkgs.fabricServers.fabric-1_21_1;
+            openFirewall = true;
 
-          inherit jvmOpts serverProperties;
+            inherit jvmOpts serverProperties;
 
-          symlinks = {
-            "mods" = "${modpack}/mods";
+            symlinks = {
+              "mods" = "${modpack}/mods";
+            };
           };
-        };
         cobble = {
           enable = false;
           autoStart = false;

hosts/mistral/minecraft.nix

@@ -27,8 +27,13 @@
 
           # nix the package manager configuration
           nix = import ./nix-settings.nix {
-            inherit lib inputs inputs' infuse;
-            inherit (pkgs) stdenv;
+            inherit
+              lib
+              inputs
+              inputs'
+              infuse
+              pkgs
+              ;
           };
 
           # nixpkgs configuration (not the flake input)
@@ -72,7 +77,9 @@
                 subversion
                 ;
 
-              home-manager = infuse inputs'.home.packages.home-manager { __input.path.__assign = "${inputs.home}"; };
+              home-manager = infuse inputs'.home.packages.home-manager {
+                __input.path.__assign = "${inputs.home}";
+              };
               man-pages = if pkgs.stdenv.isLinux then pkgs.man-pages else self'.packages.man-pages-xnu;
               gnu-coreutils = if pkgs.stdenv.isLinux then pkgs.coreutils else pkgs.coreutils-prefixed;
             };