Update dev tooling

2 files changed, 26 insertions, 15 deletions

diff --git a/shell.nix b/shell.nix
index 45261c8..a8f2db4 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,17 +1,30 @@
-with import <nixpkgs> {};
+with import (builtins.fetchGit {
+  name = "nixpkgs-20.09";
+  url = "git@github.com:nixos/nixpkgs.git";
+  rev = "cd63096d6d887d689543a0b97743d28995bc9bc3";
+  ref = "refs/tags/20.09";
+}) {};
 
-let unstable = import (
-      fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
-    ) {};
-in
+let nixpkgs-mozilla = fetchFromGitHub {
+  owner = "mozilla";
+  repo = "nixpkgs-mozilla";
+  # commit from 2020-10-28
+  rev = "8c007b60731c07dd7a052cce508de3bb1ae849b4";
+  sha256 = "1zybp62zz0h077zm2zmqs2wcg3whg6jqaah9hcl1gv4x8af4zhs6";
+}; in
+
+with import "${nixpkgs-mozilla.out}/rust-overlay.nix" pkgs pkgs;
 
 mkShell {
   buildInputs = [
-    entr
+    ((rustChannelOf { channel = "1.49.0"; }).rust.override {
+      targets = [ "wasm32-unknown-unknown" ];
+    })
+    psmisc # fuser
     gzip
     python3
-    rustup
-    unstable.binaryen
+    binaryen
     wasm-pack
+    watchexec
   ];
 }
diff --git a/watch b/watch
index 802c503..fd9f3bb 100755
--- a/watch
+++ b/watch
@@ -1,13 +1,11 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 python -m http.server --directory public 8000 &
 
 trap "fuser -k 8000/tcp" EXIT
 
-CMD="clear && wasm-pack build --target web"
-
-while true; do
-
-  find src | entr -d -s "$CMD"
-
-done
+watchexec \
+  --clear \
+  --watch src \
+  "wasm-pack build --target web"