diff --git a/flake.lock b/flake.lock
index ef62d9d5..62c7f6e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,6 +1,33 @@
 {
   "nodes": {
     "cargo2nix": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1641856772,
+        "narHash": "sha256-BKBv6fnNM+8z3uoNu64vBpP/TML0rR4QxPIpHykk6cQ=",
+        "owner": "cargo2nix",
+        "repo": "cargo2nix",
+        "rev": "97cacfbea62fb34a819c659e67a0de3bc01d1ef5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cargo2nix",
+        "ref": "be-friendly-to-users",
+        "repo": "cargo2nix",
+        "type": "github"
+      }
+    },
+    "cargo2nix_2": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
@@ -21,33 +48,12 @@
         "type": "github"
       }
     },
-    "cargo2nix_2": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1638423893,
-        "narHash": "sha256-+NTV613zwK1G4UIKrj0gh1fYDvi85qO0wxy6h11azuY=",
-        "owner": "cargo2nix",
-        "repo": "cargo2nix",
-        "rev": "ae8a5e699f57b446f9507b97a3c97a4e9fe06aa3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cargo2nix",
-        "ref": "master",
-        "repo": "cargo2nix",
-        "type": "github"
-      }
-    },
     "chir-rs": {
       "inputs": {
         "cargo2nix": "cargo2nix_2",
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_3"
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1644510727,
@@ -66,7 +72,7 @@
     },
     "dns": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -118,21 +124,6 @@
       }
     },
     "flake-utils_2": {
-      "locked": {
-        "lastModified": 1638122382,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -147,7 +138,7 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_3": {
       "locked": {
         "lastModified": 1614513358,
         "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
@@ -162,6 +153,21 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "flake-utils_5": {
       "locked": {
         "lastModified": 1638122382,
@@ -230,7 +236,7 @@
     },
     "nix-gaming": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "utils": "utils"
       },
       "locked": {
@@ -280,22 +286,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1638109994,
-        "narHash": "sha256-OpA37PTiPMIqoRJbufbl5rOLII7HeeGcA0yl7FoyCIE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a284564b7f75ac4db73607db02076e8da9d42c9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-21.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1644472683,
         "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=",
@@ -311,7 +301,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1645162597,
         "narHash": "sha256-S4sRtJBqVlBg4H7EPAv0NFofGNCayHEMpLnUzGNCCKM=",
@@ -326,13 +316,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1646510032,
-        "narHash": "sha256-x2R58XetCRvQVTTxVEJyz4ONkru3E2cbLlcb8PorOJw=",
+        "lastModified": 1646512003,
+        "narHash": "sha256-JMeHfHn3+TErHApdjLnk/f5daU86p4QRDn3eljorru4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d91f8b3685db019fe198f92434e87a4956c9755d",
+        "rev": "c45608c6cc881ab47cec27e3aa889de9a90db394",
         "type": "github"
       },
       "original": {
@@ -401,15 +391,48 @@
         "cargo2nix": "cargo2nix",
         "chir-rs": "chir-rs",
         "dns": "dns",
+        "flake-utils": "flake-utils_4",
         "home-manager": "home-manager",
         "nix-gaming": "nix-gaming",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-soundtouch": "nixpkgs-soundtouch",
         "nur": "nur",
         "polymc": "polymc",
+        "rust-binaries": "rust-binaries",
+        "rust-overlay": "rust-overlay_3",
         "sops-nix": "sops-nix"
       }
     },
+    "rust-binaries": {
+      "inputs": {
+        "cargo2nix": [
+          "cargo2nix"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1646512121,
+        "narHash": "sha256-tpsdfoIoyWjaAXHabfyITUcLrzKv4/niakSt9bAeOkQ=",
+        "ref": "main",
+        "rev": "34c1240c315285caffe338acf700143e084150ae",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.chir.rs/darkkirb/rust-binaries"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.chir.rs/darkkirb/rust-binaries"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": [
@@ -436,31 +459,6 @@
       }
     },
     "rust-overlay_2": {
-      "inputs": {
-        "flake-utils": [
-          "cargo2nix",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "cargo2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1638152159,
-        "narHash": "sha256-Q0UHsm36cCxk16I/bF1rHJHxjIflESKk2ej76P39j90=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "d9a664513558376595e838b21348cdac0ba3115e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_3": {
       "inputs": {
         "flake-utils": [
           "chir-rs",
@@ -485,6 +483,29 @@
         "type": "github"
       }
     },
+    "rust-overlay_3": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1646447076,
+        "narHash": "sha256-iGA3OueLeVPjyFM6LjDK1wIIci1DwsLh7CUCRc1qRbA=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "6923045c7b80aba6c81fe3eca7824a20c8724c0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index f2bf4328..2543d0a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,22 +2,36 @@ rec {
   description = "Lotte's NixOS installation";
 
   # Use NixOS unstable
-  inputs.nixpkgs.url = github:NixOS/nixpkgs;
-  inputs.nixpkgs-soundtouch.url = "github:darkkirb/nixpkgs?ref=soundtouch-2.3.1";
-  inputs.cargo2nix.url = "github:cargo2nix/cargo2nix/master"; # dummy
-  inputs.home-manager.url = "github:nix-community/home-manager";
-  inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.sops-nix.url = github:Mic92/sops-nix;
-  inputs.sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.chir-rs.url = "git+https://git.chir.rs/darkkirb/chir.rs.git?ref=main";
-  #inputs.chir-rs.inputs.nixpkgs.follows = "nixpkgs"; # nixpkgs regression?
-  inputs.nur.url = "github:nix-community/NUR";
-  inputs.nix-gaming.url = github:fufexan/nix-gaming;
-  #inputs.nix-gaming.inputs.nixpkgs.follows = "nixpkgs"; # rebuilds wine-tkg literally every goddamn time
-  inputs.polymc.url = "github:PolyMC/PolyMC";
-  inputs.polymc.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.dns.url = "github:DarkKirb/dns.nix?ref=master";
-  inputs.dns.inputs.nixpkgs.follows = "nixpkgs";
+  inputs = {
+    nixpkgs.url = github:NixOS/nixpkgs;
+    nixpkgs-soundtouch.url = "github:darkkirb/nixpkgs?ref=soundtouch-2.3.1";
+    flake-utils.url = github:numtide/flake-utils;
+    rust-overlay.url = github:oxalica/rust-overlay;
+    cargo2nix.url = "github:cargo2nix/cargo2nix/be-friendly-to-users"; # dummy
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix.url = github:Mic92/sops-nix;
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    chir-rs.url = "git+https://git.chir.rs/darkkirb/chir.rs.git?ref=main";
+    #chir-rs.inputs.nixpkgs.follows = "nixpkgs"; # nixpkgs regression?
+    nur.url = "github:nix-community/NUR";
+    nix-gaming.url = github:fufexan/nix-gaming;
+    #nix-gaming.inputs.nixpkgs.follows = "nixpkgs"; # rebuilds wine-tkg literally every goddamn time
+    polymc.url = "github:PolyMC/PolyMC";
+    polymc.inputs.nixpkgs.follows = "nixpkgs";
+    dns.url = "github:DarkKirb/dns.nix?ref=master";
+    dns.inputs.nixpkgs.follows = "nixpkgs";
+    rust-binaries.url = "git+https://git.chir.rs/darkkirb/rust-binaries?ref=main";
+    rust-binaries.inputs.nixpkgs.follows = "nixpkgs";
+    rust-binaries.inputs.flake-utils.follows = "flake-utils";
+    rust-binaries.inputs.rust-overlay.follows = "rust-overlay";
+    rust-binaries.inputs.cargo2nix.follows = "cargo2nix";
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    rust-overlay.inputs.flake-utils.follows = "flake-utils";
+    cargo2nix.inputs.rust-overlay.follows = "rust-overlay";
+    cargo2nix.inputs.nixpkgs.follows = "nixpkgs";
+    cargo2nix.inputs.flake-utils.follows = "flake-utils";
+  };
 
   outputs = { self, nixpkgs, sops-nix, home-manager, chir-rs, nur, nix-gaming, polymc, ... } @ args:
     let