From 85f4104796feccec710c6a94e828a53d5dae3fa2 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 4 Nov 2021 16:58:13 +0100
Subject: [PATCH] Also add a shell.nix

---
 README.md   | 13 +++++--------
 default.nix | 27 +++++++++++++++++++++++++++
 flake.nix   | 26 +-------------------------
 shell.nix   |  8 ++++++++
 4 files changed, 41 insertions(+), 33 deletions(-)
 create mode 100644 default.nix
 create mode 100644 shell.nix

diff --git a/README.md b/README.md
index d08df2d..9874719 100644
--- a/README.md
+++ b/README.md
@@ -172,14 +172,11 @@ If you want to play with the `restream` code, you will have to [install Rust](ht
 There are three ways of building the required restream binary for streaming the reMarkable framebuffer. For these approaches, the generated restream binary will be located under `target/armv7-unknown-linux-gnueabihf/release/restream`.
 
 - **Using nix flakes**
-    With [Nix](https://nixos.org/guides/install-nix.html) installed and
-    [Nix flakes](https://nixos.wiki/wiki/Flakes#Installing_flakes) enabled, you
-    can easily setup the devlopment environment with:
-    ```
-    nix develop
-    ```
-    After which you can simply run `cargo build --release` to build the restream
-    binary.
+  With [Nix](https://nixos.org/guides/install-nix.html) installed you can
+  create the development environment with `nix-shell` or (when using
+  [Nix flakes](https://nixos.wiki/wiki/Flakes#Installing_flakes) `nix-develop`.
+  After which you can simply run `cargo build --release` to build the restream
+  binary on your machine.
 
 - **Using docker and the toltec toolchain:**
   You can use the [toltec toolchain docker images](https://github.com/toltec-dev/toolchain) to build a restream binary compatible with the reMarkable.
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..42d06de
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,27 @@
+{
+  devShell = pkgs: with pkgs; mkShell {
+      buildInputs = [
+        remarkable-toolchain
+        (rust-bin.stable.latest.default.override {
+          targets = [ "armv7-unknown-linux-gnueabihf" ];
+          extensions = [ "rust-src" ];
+        })
+        openssl.dev
+        pkg-config
+        cargo-watch
+        cargo-limit
+        shellcheck
+        lz4
+      ];
+      CARGO_BUILD_TARGET="armv7-unknown-linux-gnueabihf";
+      CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="${pkgs.remarkable-toolchain}/sysroots/x86_64-codexsdk-linux/usr/bin/arm-remarkable-linux-gnueabi/arm-remarkable-linux-gnueabi-gcc";
+      CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS=[
+        "-C link-arg=-march=armv7-a"
+        "-C link-arg=-marm"
+        "-C link-arg=-mfpu=neon"
+        "-C link-arg=-mfloat-abi=hard"
+        "-C link-arg=-mcpu=cortex-a9"
+        "-C link-arg=--sysroot=${pkgs.remarkable-toolchain}/sysroots/cortexa9hf-neon-remarkable-linux-gnueabi"
+      ];
+    };
+}
diff --git a/flake.nix b/flake.nix
index 8f90aa5..23ee015 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,30 +20,6 @@
   in
   with pkgs;
   {
-    devShell = mkShell {
-      buildInputs = [
-        remarkable-toolchain
-        (rust-bin.stable.latest.default.override {
-          targets = [ "armv7-unknown-linux-gnueabihf" ];
-          extensions = [ "rust-src" ];
-        })
-        openssl.dev
-        pkg-config
-        cargo-watch
-        cargo-limit
-        shellcheck
-        lz4
-      ];
-      CARGO_BUILD_TARGET="armv7-unknown-linux-gnueabihf";
-      CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="${pkgs.remarkable-toolchain}/sysroots/x86_64-codexsdk-linux/usr/bin/arm-remarkable-linux-gnueabi/arm-remarkable-linux-gnueabi-gcc";
-      CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS=[
-        "-C link-arg=-march=armv7-a"
-        "-C link-arg=-marm"
-        "-C link-arg=-mfpu=neon"
-        "-C link-arg=-mfloat-abi=hard"
-        "-C link-arg=-mcpu=cortex-a9"
-        "-C link-arg=--sysroot=${pkgs.remarkable-toolchain}/sysroots/cortexa9hf-neon-remarkable-linux-gnueabi"
-      ];
-    };
+    devShell = (import ./default.nix).devShell pkgs;
   });
 }
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..d69c239
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,8 @@
+let
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
+    ];
+  };
+  reStreamDev = import ./default.nix;
+in reStreamDev.devShell pkgs