diff --git a/packages/com.github.androiddumps.firmware_extractor/flake.lock b/packages/com.github.androiddumps.firmware_extractor/flake.lock
new file mode 100644
index 0000000..ccbd066
--- /dev/null
+++ b/packages/com.github.androiddumps.firmware_extractor/flake.lock
@@ -0,0 +1,44 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1646011258,
+        "narHash": "sha256-+aen4zu5uVp52arEcgL2maCS0zQDuG1t+Azwd/O1gN4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a25df4c2b79c4343bcc72ad671200e5a3e286c41",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "src": "src"
+      }
+    },
+    "src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1642747836,
+        "narHash": "sha256-/ucpa+jyvU0+Ow46YwBfQ8+DCsnZXRPtT3zv5hEuCLg=",
+        "owner": "AndroidDumps",
+        "repo": "Firmware_extractor",
+        "rev": "8a7561d5d3751618d0a9865a5ac61578c6ebc40d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AndroidDumps",
+        "repo": "Firmware_extractor",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/packages/com.github.androiddumps.firmware_extractor/flake.nix b/packages/com.github.androiddumps.firmware_extractor/flake.nix
new file mode 100644
index 0000000..2c3928b
--- /dev/null
+++ b/packages/com.github.androiddumps.firmware_extractor/flake.nix
@@ -0,0 +1,22 @@
+{
+  description = "A flake to build android's partition-tools package";
+
+  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
+
+  inputs.src.url = github:AndroidDumps/Firmware_extractor;
+  inputs.src.flake = false;
+
+  outputs = { self, nixpkgs, src }: {
+
+    packages.x86_64-linux.partition-tools =
+      with import nixpkgs { system = "x86_64-linux"; };
+      stdenv.mkDerivation {
+        inherit src;
+        name = "partition-tools";
+        installPhase = "mkdir -p $out/bin && cp ${src}/tools/Linux/bin/* $out/bin && cp ${src}/tools/Linux/bin/bin/* $out/bin";
+      };
+
+    defaultPackage.x86_64-linux = self.packages.x86_64-linux.partition-tools;
+
+  };
+}
diff --git a/users/minion/home.nix b/users/minion/home.nix
index 583c726..0051cb0 100644
--- a/users/minion/home.nix
+++ b/users/minion/home.nix
@@ -81,7 +81,7 @@
       #     , $@
           local p='/nix/store/ycclzpk99snlrk8sg9n4j8pm1927gavw-command-not-found/bin/command-not-found';
           if [ -x "$p" ] && [ -f '/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite' ]; then
-              "$p" "$@";
+              "$p" "$@" 2>&1 | sed -r 's/nix-shell -p (\S+)/nix shell nixpkgs#\1/g' 1>&2;
              if [ $? = 126 ]; then
                   "$@";
               else